From c036485ce50f852855a6ffab24e805c0ef66a15d Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 11 Dec 2009 13:33:40 -0800 Subject: [PATCH] Update patch hunk offsets for next-20091211 Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 10 +++++----- patches/07-change-default-rate-alg.patch | 8 ++++---- patches/09-threaded-irq.patch | 10 +++++----- patches/15-symbol-export-conflicts.patch | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index 40a265821f7a..86bf1a98001b 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -185,9 +185,9 @@ without creating a headache on maintenance of the pathes. if (ieee80211_vif_is_mesh(&sdata->vif) && params && params->mesh_id_len) ieee80211_sdata_set_mesh_id(sdata, ---- a/drivers/net/b44.c 2009-12-10 08:42:34.000000000 -0800 -+++ b/drivers/net/b44.c 2009-12-10 08:42:34.000000000 -0800 -@@ -2116,6 +2116,7 @@ +--- a/drivers/net/b44.c 2009-12-11 13:23:58.000000000 -0800 ++++ b/drivers/net/b44.c 2009-12-11 13:23:58.000000000 -0800 +@@ -2115,6 +2115,7 @@ static int __devinit b44_get_invariants( return err; } @@ -195,7 +195,7 @@ without creating a headache on maintenance of the pathes. static const struct net_device_ops b44_netdev_ops = { .ndo_open = b44_open, .ndo_stop = b44_close, -@@ -2131,6 +2132,7 @@ +@@ -2130,6 +2131,7 @@ static const struct net_device_ops b44_n .ndo_poll_controller = b44_poll_controller, #endif }; @@ -203,7 +203,7 @@ without creating a headache on maintenance of the pathes. static int __devinit b44_init_one(struct ssb_device *sdev, const struct ssb_device_id *ent) -@@ -2170,9 +2172,26 @@ +@@ -2169,9 +2171,26 @@ static int __devinit b44_init_one(struct bp->rx_pending = B44_DEF_RX_RING_PENDING; bp->tx_pending = B44_DEF_TX_RING_PENDING; diff --git a/patches/07-change-default-rate-alg.patch b/patches/07-change-default-rate-alg.patch index 159b9317a971..480f48918697 100644 --- a/patches/07-change-default-rate-alg.patch +++ b/patches/07-change-default-rate-alg.patch @@ -10,8 +10,8 @@ and define CONFIG_COMPAT_MAC80211_RC_DEFAULT on config.mk. Through the compat autoconf we then get it also defined there at compilation time. ---- a/net/mac80211/rate.c 2009-12-10 08:44:19.000000000 -0800 -+++ b/net/mac80211/rate.c 2009-12-10 08:46:38.000000000 -0800 +--- a/net/mac80211/rate.c 2009-12-11 13:25:55.000000000 -0800 ++++ b/net/mac80211/rate.c 2009-12-11 13:27:15.000000000 -0800 @@ -22,7 +22,7 @@ struct rate_control_alg { static LIST_HEAD(rate_ctrl_algs); static DEFINE_MUTEX(rate_ctrl_mutex); @@ -21,7 +21,7 @@ at compilation time. module_param(ieee80211_default_rc_algo, charp, 0644); MODULE_PARM_DESC(ieee80211_default_rc_algo, "Default rate control algorithm for mac80211 to use"); -@@ -118,8 +118,8 @@ ieee80211_rate_control_ops_get(const cha +@@ -117,8 +117,8 @@ ieee80211_rate_control_ops_get(const cha ops = ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo); /* try built-in one if specific alg requested but not found */ @@ -29,6 +29,6 @@ at compilation time. - ops = ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT); + if (!ops && strlen(CONFIG_COMPAT_MAC80211_RC_DEFAULT)) + ops = ieee80211_try_rate_control_ops_get(CONFIG_COMPAT_MAC80211_RC_DEFAULT); - kparam_unblock_sysfs_write(ieee80211_default_rc_algo); return ops; + } diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch index 6731ee8d1370..35075971dc0b 100644 --- a/patches/09-threaded-irq.patch +++ b/patches/09-threaded-irq.patch @@ -4,9 +4,9 @@ on older kernels we built our own struct compat_threaded_irq to queue_work() onto it as the kernel thread be running the thread in process context as well. ---- a/drivers/net/wireless/b43/main.c 2009-11-13 11:39:32.000000000 -0800 -+++ b/drivers/net/wireless/b43/main.c 2009-11-13 11:39:33.000000000 -0800 -@@ -3909,8 +3909,13 @@ +--- a/drivers/net/wireless/b43/main.c 2009-12-11 13:29:21.000000000 -0800 ++++ b/drivers/net/wireless/b43/main.c 2009-12-11 13:29:22.000000000 -0800 +@@ -3912,8 +3912,13 @@ if (dev->dev->bus->bustype == SSB_BUSTYPE_SDIO) { b43_sdio_free_irq(dev); } else { @@ -20,7 +20,7 @@ thread in process context as well. } mutex_lock(&wl->mutex); dev = wl->current_dev; -@@ -3950,9 +3955,17 @@ +@@ -3953,9 +3958,17 @@ goto out; } } else { @@ -38,7 +38,7 @@ thread in process context as well. if (err) { b43err(dev->wl, "Cannot request IRQ-%d\n", dev->dev->irq); goto out; -@@ -4659,6 +4672,10 @@ +@@ -4662,6 +4675,10 @@ static void b43_wireless_core_detach(struct b43_wldev *dev) { diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch index 053867136582..3eada2d80bf4 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 2009-11-13 11:41:29.000000000 -0800 -+++ b/net/mac80211/rx.c 2009-11-13 11:41:30.000000000 -0800 -@@ -2537,7 +2537,12 @@ +--- a/net/mac80211/rx.c 2009-12-11 13:32:17.000000000 -0800 ++++ b/net/mac80211/rx.c 2009-12-11 13:32:18.000000000 -0800 +@@ -2536,7 +2536,12 @@ drop: kfree_skb(skb); } -- 2.30.2