From 83de84173c2362302c23be1579b37409a736e3ef Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Wed, 23 Sep 2009 10:31:53 -0700 Subject: [PATCH] Update hunks for master-2009-09-23 Signed-off-by: Luis R. Rodriguez --- compat/patches/01-netdev.patch | 10 +++++----- compat/patches/03-rfkill.patch | 6 +++--- compat/patches/05-usb.patch | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/compat/patches/01-netdev.patch b/compat/patches/01-netdev.patch index 6d37bb7abcb3..9260bfbedf41 100644 --- a/compat/patches/01-netdev.patch +++ b/compat/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-09-02 14:11:16.241100413 -0700 -+++ b/drivers/net/b44.c 2009-09-02 14:11:16.485096724 -0700 -@@ -2113,6 +2113,7 @@ +--- a/drivers/net/b44.c 2009-09-23 10:29:49.423721274 -0700 ++++ b/drivers/net/b44.c 2009-09-23 10:29:49.503708316 -0700 +@@ -2119,6 +2119,7 @@ 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, -@@ -2128,6 +2129,7 @@ +@@ -2134,6 +2135,7 @@ .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) -@@ -2167,9 +2169,26 @@ +@@ -2173,9 +2175,26 @@ bp->rx_pending = B44_DEF_RX_RING_PENDING; bp->tx_pending = B44_DEF_TX_RING_PENDING; diff --git a/compat/patches/03-rfkill.patch b/compat/patches/03-rfkill.patch index c720c49a7923..dadcb9acc7da 100644 --- a/compat/patches/03-rfkill.patch +++ b/compat/patches/03-rfkill.patch @@ -206,9 +206,9 @@ This would do the policing from within mac80211. #include #include #include ---- a/drivers/net/wireless/ath/ath9k/hw.c 2009-09-02 14:15:13.145121592 -0700 -+++ b/drivers/net/wireless/ath/ath9k/hw.c 2009-09-02 14:15:14.289114759 -0700 -@@ -3643,7 +3643,7 @@ +--- a/drivers/net/wireless/ath/ath9k/hw.c 2009-09-23 10:28:55.875708257 -0700 ++++ b/drivers/net/wireless/ath/ath9k/hw.c 2009-09-23 10:28:56.211707588 -0700 +@@ -3688,7 +3688,7 @@ pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM; diff --git a/compat/patches/05-usb.patch b/compat/patches/05-usb.patch index e81b41b36886..174f6ee53c4f 100644 --- a/compat/patches/05-usb.patch +++ b/compat/patches/05-usb.patch @@ -1,8 +1,8 @@ USB opt soft_unbid was added as of 2.6.27. ---- a/drivers/net/wireless/p54/p54usb.c 2009-07-07 13:36:49.523678591 -0700 -+++ b/drivers/net/wireless/p54/p54usb.c 2009-07-07 13:36:49.831718432 -0700 -@@ -1047,7 +1047,9 @@ +--- a/drivers/net/wireless/p54/p54usb.c 2009-09-23 10:28:04.963708264 -0700 ++++ b/drivers/net/wireless/p54/p54usb.c 2009-09-23 10:28:05.199734839 -0700 +@@ -1048,7 +1048,9 @@ .resume = p54u_resume, .reset_resume = p54u_resume, #endif /* CONFIG_PM */ -- 2.30.2