summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 72e6376)
raw | patch | inline | side by side (parent: 72e6376)
author | Hauke Mehrtens <hauke@hauke-m.de> | |
Tue, 2 Aug 2011 21:15:15 +0000 (23:15 +0200) | ||
committer | Luis R. Rodriguez <mcgrof@qca.qualcomm.com> | |
Tue, 2 Aug 2011 21:25:30 +0000 (14:25 -0700) |
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
patches/01-netdev.patch | patch | blob | history |
index 244e03eb88f65389291ea47b8bed7de06fcbfd18..c0e938ce6d24ee12b8da8f476abf93a511616fc4 100644 (file)
--- a/patches/01-netdev.patch
+++ b/patches/01-netdev.patch
retval = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &tmp,
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -698,7 +698,12 @@ static const struct net_device_ops ieee8
- static void ieee80211_if_setup(struct net_device *dev)
+@@ -699,7 +699,12 @@ static void ieee80211_if_setup(struct ne
{
ether_setup(dev);
+ dev->priv_flags &= ~IFF_TX_SKB_SHARING;
- dev->netdev_ops = &ieee80211_dataif_ops;
+ netdev_attach_ops(dev, &ieee80211_dataif_ops);
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
dev->destructor = free_netdev;
}
-@@ -845,7 +850,7 @@ static void ieee80211_setup_sdata(struct
+@@ -846,7 +851,7 @@ static void ieee80211_setup_sdata(struct
/* and set some type-dependent values */
sdata->vif.type = type;
sdata->vif.p2p = false;
sdata->wdev.iftype = type;
sdata->control_port_protocol = cpu_to_be16(ETH_P_PAE);
-@@ -884,7 +889,7 @@ static void ieee80211_setup_sdata(struct
+@@ -885,7 +890,7 @@ static void ieee80211_setup_sdata(struct
break;
case NL80211_IFTYPE_MONITOR:
sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;
sdata->u.mntr_flags = MONITOR_FLAG_CONTROL |
MONITOR_FLAG_OTHER_BSS;
break;
-@@ -1135,6 +1140,8 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1136,6 +1141,8 @@ int ieee80211_if_add(struct ieee80211_lo
return -ENOMEM;
dev_net_set(ndev, wiphy_net(local->hw.wiphy));
ndev->needed_headroom = local->tx_headroom +
4*6 /* four MAC addresses */
+ 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -1143,6 +1150,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1144,6 +1151,7 @@ int ieee80211_if_add(struct ieee80211_lo
- ETH_HLEN /* ethernet hard_header_len */
+ IEEE80211_ENCRYPT_HEADROOM;
ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
{
struct bnep_session *s = netdev_priv(dev);
struct sock *sk = s->sock->sk;
-@@ -231,7 +235,7 @@ void bnep_net_setup(struct net_device *d
- dev->addr_len = ETH_ALEN;
+@@ -232,7 +236,7 @@ void bnep_net_setup(struct net_device *d
ether_setup(dev);
+ dev->priv_flags &= ~IFF_TX_SKB_SHARING;
- dev->netdev_ops = &bnep_netdev_ops;
+ netdev_attach_ops(dev, &bnep_netdev_ops);