From: Luis R. Rodriguez Date: Wed, 6 Jan 2010 22:57:07 +0000 (-0800) Subject: Update patch hunks for next-20100106 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5b4baf76f92e5ba9b65eeac01464c8d8b35421b7;p=openwrt%2Fstaging%2Fblogic.git Update patch hunks for next-20100106 Signed-off-by: Luis R. Rodriguez --- diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index 9fd8ff7e7842..fd20bf241b8d 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -100,19 +100,19 @@ without creating a headache on maintenance of the pathes. tmp = RNDIS_PACKET_TYPE_DIRECTED | RNDIS_PACKET_TYPE_BROADCAST; retval = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &tmp, ---- a/net/mac80211/iface.c -+++ b/net/mac80211/iface.c -@@ -657,6 +657,7 @@ static void ieee80211_teardown_sdata(str - WARN_ON(flushed); +--- a/net/mac80211/iface.c 2010-01-06 14:53:03.000000000 -0800 ++++ b/net/mac80211/iface.c 2010-01-06 14:53:04.000000000 -0800 +@@ -666,6 +666,7 @@ static u16 ieee80211_netdev_select_queue + return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb); } +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) static const struct net_device_ops ieee80211_dataif_ops = { .ndo_open = ieee80211_open, .ndo_stop = ieee80211_stop, -@@ -676,11 +677,23 @@ static const struct net_device_ops ieee8 - .ndo_change_mtu = ieee80211_change_mtu, +@@ -712,11 +713,23 @@ static const struct net_device_ops ieee8 .ndo_set_mac_address = eth_mac_addr, + .ndo_select_queue = ieee80211_monitor_select_queue, }; +#endif @@ -134,7 +134,7 @@ without creating a headache on maintenance of the pathes. dev->destructor = free_netdev; } -@@ -695,7 +708,12 @@ static void ieee80211_setup_sdata(struct +@@ -731,7 +744,12 @@ static void ieee80211_setup_sdata(struct /* and set some type-dependent values */ sdata->vif.type = type; @@ -147,7 +147,7 @@ without creating a headache on maintenance of the pathes. sdata->wdev.iftype = type; /* only monitor differs */ -@@ -718,7 +736,11 @@ static void ieee80211_setup_sdata(struct +@@ -754,7 +772,11 @@ static void ieee80211_setup_sdata(struct break; case NL80211_IFTYPE_MONITOR: sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP; @@ -159,7 +159,7 @@ without creating a headache on maintenance of the pathes. sdata->u.mntr_flags = MONITOR_FLAG_CONTROL | MONITOR_FLAG_OTHER_BSS; break; -@@ -787,6 +809,8 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -823,6 +845,8 @@ int ieee80211_if_add(struct ieee80211_lo return -ENOMEM; dev_net_set(ndev, wiphy_net(local->hw.wiphy)); @@ -168,7 +168,7 @@ without creating a headache on maintenance of the pathes. ndev->needed_headroom = local->tx_headroom + 4*6 /* four MAC addresses */ + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */ -@@ -795,6 +819,7 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -831,6 +855,7 @@ int ieee80211_if_add(struct ieee80211_lo - ETH_HLEN /* ethernet hard_header_len */ + IEEE80211_ENCRYPT_HEADROOM; ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; @@ -176,7 +176,7 @@ without creating a headache on maintenance of the pathes. ret = dev_alloc_name(ndev, ndev->name); if (ret < 0) -@@ -836,6 +861,10 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -872,6 +897,10 @@ int ieee80211_if_add(struct ieee80211_lo if (ret) goto fail; diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch index e93f070348a3..f56fa66f102a 100644 --- a/patches/15-symbol-export-conflicts.patch +++ b/patches/15-symbol-export-conflicts.patch @@ -1,9 +1,9 @@ In kernel < 2.6.32 libipw also exports ieee80211_rx. To avoid conflicts with the other export we rename our. ---- a/net/mac80211/rx.c -+++ b/net/mac80211/rx.c -@@ -2470,7 +2470,12 @@ void ieee80211_rx(struct ieee80211_hw *h +--- a/net/mac80211/rx.c 2010-01-06 14:54:08.000000000 -0800 ++++ b/net/mac80211/rx.c 2010-01-06 14:54:09.000000000 -0800 +@@ -2472,7 +2472,12 @@ drop: kfree_skb(skb); } diff --git a/patches/17-netdev-queue.patch b/patches/17-netdev-queue.patch index 0ecc23f86d92..1b1d1d6b3b70 100644 --- a/patches/17-netdev-queue.patch +++ b/patches/17-netdev-queue.patch @@ -12,9 +12,9 @@ The patch that introduced this on mac80211 was: Reviewed-by: Johannes Berg Signed-off-by: John W. Linville ---- a/net/mac80211/iface.c -+++ b/net/mac80211/iface.c -@@ -901,6 +901,7 @@ void ieee80211_if_remove(struct ieee8021 +--- a/net/mac80211/iface.c 2010-01-06 14:55:28.000000000 -0800 ++++ b/net/mac80211/iface.c 2010-01-06 14:55:28.000000000 -0800 +@@ -937,6 +937,7 @@ void ieee80211_if_remove(struct ieee8021 * Remove all interfaces, may only be called at hardware unregistration * time because it doesn't do RCU-safe list removals. */ @@ -22,7 +22,7 @@ The patch that introduced this on mac80211 was: void ieee80211_remove_interfaces(struct ieee80211_local *local) { struct ieee80211_sub_if_data *sdata, *tmp; -@@ -917,6 +918,22 @@ void ieee80211_remove_interfaces(struct +@@ -953,6 +954,22 @@ void ieee80211_remove_interfaces(struct mutex_unlock(&local->iflist_mtx); unregister_netdevice_many(&unreg_list); }