From: Luis R. Rodriguez Date: Mon, 2 Nov 2009 16:09:37 +0000 (-0800) Subject: Update patch hunk offsets X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=650eab580840544fcb6d87d3bd34cb39282317bd;p=openwrt%2Fstaging%2Fblogic.git Update patch hunk offsets Signed-off-by: Luis R. Rodriguez --- diff --git a/compat/patches/01-netdev.patch b/compat/patches/01-netdev.patch index dd2e33d2f524..0a858f225000 100644 --- a/compat/patches/01-netdev.patch +++ b/compat/patches/01-netdev.patch @@ -397,9 +397,9 @@ without creating a headache on maintenance of the pathes. priv->wireless_data.spy_data = &priv->ieee->spy_data; net_dev->wireless_data = &priv->wireless_data; net_dev->wireless_handlers = &ipw_wx_handler_def; ---- a/drivers/net/wireless/libertas/main.c 2009-10-07 01:42:20.000000000 -0400 -+++ b/drivers/net/wireless/libertas/main.c 2009-10-07 01:42:21.000000000 -0400 -@@ -1229,6 +1229,7 @@ +--- a/drivers/net/wireless/libertas/main.c 2009-11-02 08:04:43.000000000 -0800 ++++ b/drivers/net/wireless/libertas/main.c 2009-11-02 08:04:44.000000000 -0800 +@@ -1109,6 +1109,7 @@ lbs_deb_leave(LBS_DEB_MAIN); } @@ -407,7 +407,7 @@ without creating a headache on maintenance of the pathes. static const struct net_device_ops lbs_netdev_ops = { .ndo_open = lbs_dev_open, .ndo_stop = lbs_eth_stop, -@@ -1239,6 +1240,7 @@ +@@ -1119,6 +1120,7 @@ .ndo_change_mtu = eth_change_mtu, .ndo_validate_addr = eth_validate_addr, }; @@ -415,7 +415,7 @@ without creating a headache on maintenance of the pathes. /** * @brief This function adds the card. it will probe the -@@ -1284,7 +1286,16 @@ +@@ -1164,7 +1166,16 @@ wdev->netdev = dev; priv->dev = dev; @@ -432,7 +432,7 @@ without creating a headache on maintenance of the pathes. dev->watchdog_timeo = 5 * HZ; dev->ethtool_ops = &lbs_ethtool_ops; #ifdef WIRELESS_EXT -@@ -1531,6 +1542,7 @@ +@@ -1405,6 +1416,7 @@ EXPORT_SYMBOL_GPL(lbs_stop_card); @@ -440,7 +440,7 @@ without creating a headache on maintenance of the pathes. static const struct net_device_ops mesh_netdev_ops = { .ndo_open = lbs_dev_open, .ndo_stop = lbs_mesh_stop, -@@ -1538,6 +1550,7 @@ +@@ -1412,6 +1424,7 @@ .ndo_set_mac_address = lbs_set_mac_address, .ndo_set_multicast_list = lbs_set_multicast_list, }; @@ -448,7 +448,7 @@ without creating a headache on maintenance of the pathes. /** * @brief This function adds mshX interface -@@ -1561,7 +1574,15 @@ +@@ -1435,7 +1448,15 @@ mesh_dev->ml_priv = priv; priv->mesh_dev = mesh_dev; @@ -464,7 +464,7 @@ without creating a headache on maintenance of the pathes. mesh_dev->ethtool_ops = &lbs_ethtool_ops; memcpy(mesh_dev->dev_addr, priv->dev->dev_addr, sizeof(priv->dev->dev_addr)); -@@ -1777,11 +1798,13 @@ +@@ -1589,11 +1610,13 @@ lbs_deb_leave(LBS_DEB_MAIN); } @@ -478,7 +478,7 @@ without creating a headache on maintenance of the pathes. static int lbs_add_rtap(struct lbs_private *priv) { -@@ -1802,7 +1825,13 @@ +@@ -1614,7 +1637,13 @@ memcpy(rtap_dev->dev_addr, priv->current_addr, ETH_ALEN); rtap_dev->type = ARPHRD_IEEE80211_RADIOTAP; diff --git a/compat/patches/03-rfkill.patch b/compat/patches/03-rfkill.patch index bbb2c954e0b1..28e0b18af758 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-10-06 12:55:01.000000000 -0400 -+++ b/drivers/net/wireless/ath/ath9k/hw.c 2009-10-06 12:55:02.000000000 -0400 -@@ -3675,7 +3675,7 @@ +--- a/drivers/net/wireless/ath/ath9k/hw.c 2009-11-02 08:06:38.000000000 -0800 ++++ b/drivers/net/wireless/ath/ath9k/hw.c 2009-11-02 08:06:39.000000000 -0800 +@@ -3254,7 +3254,7 @@ pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM; diff --git a/compat/patches/08-rename-iwl4965-config.patch b/compat/patches/08-rename-iwl4965-config.patch index b0add3977344..3b90c0f981b0 100644 --- a/compat/patches/08-rename-iwl4965-config.patch +++ b/compat/patches/08-rename-iwl4965-config.patch @@ -14,9 +14,9 @@ CONFIG_IWL4965 has to be set to y, to build correctly. iwlagn-$(CONFIG_IWL5000) += iwl-5000.o iwlagn-$(CONFIG_IWL5000) += iwl-6000.o iwlagn-$(CONFIG_IWL5000) += iwl-1000.o ---- a/drivers/net/wireless/iwlwifi/iwl-agn.c 2009-10-06 12:57:49.000000000 -0400 -+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c 2009-10-06 12:57:50.000000000 -0400 -@@ -3239,10 +3239,10 @@ +--- a/drivers/net/wireless/iwlwifi/iwl-agn.c 2009-11-02 08:07:33.000000000 -0800 ++++ b/drivers/net/wireless/iwlwifi/iwl-agn.c 2009-11-02 08:07:33.000000000 -0800 +@@ -3323,10 +3323,10 @@ /* Hardware specific file defines the PCI IDs table for that hardware module */ static struct pci_device_id iwl_hw_card_ids[] = { diff --git a/compat/patches/10-add-wext-handlers-to-netdev.patch b/compat/patches/10-add-wext-handlers-to-netdev.patch index ec2249c82822..a85aa82e6bbe 100644 --- a/compat/patches/10-add-wext-handlers-to-netdev.patch +++ b/compat/patches/10-add-wext-handlers-to-netdev.patch @@ -11,9 +11,9 @@ users use wext again. We only do this for kernels <= 2.6.32 as 2.6.33 will use the struct wiphy wireless handler. ---- a/net/wireless/core.c 2009-10-06 13:23:34.000000000 -0400 -+++ b/net/wireless/core.c 2009-10-06 13:25:31.000000000 -0400 -@@ -672,6 +672,10 @@ +--- a/net/wireless/core.c 2009-11-02 08:08:20.000000000 -0800 ++++ b/net/wireless/core.c 2009-11-02 08:08:21.000000000 -0800 +@@ -671,6 +671,10 @@ wdev->sme_state = CFG80211_SME_IDLE; mutex_unlock(&rdev->devlist_mtx); #ifdef CONFIG_CFG80211_WEXT diff --git a/compat/patches/15-symbol-export-conflicts.patch b/compat/patches/15-symbol-export-conflicts.patch index e095f9bf8c32..70ff4c9e92be 100644 --- a/compat/patches/15-symbol-export-conflicts.patch +++ b/compat/patches/15-symbol-export-conflicts.patch @@ -1,11 +1,9 @@ In kernel < 2.6.32 libipw also exports ieee80211_rx. To avoid conflicts with the other export we rename our. -diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c -index 5c385e3..26e5fc9 100644 ---- a/net/mac80211/rx.c -+++ b/net/mac80211/rx.c -@@ -2545,7 +2545,12 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb) +--- a/net/mac80211/rx.c 2009-11-02 08:08:54.000000000 -0800 ++++ b/net/mac80211/rx.c 2009-11-02 08:08:55.000000000 -0800 +@@ -2536,7 +2536,12 @@ drop: kfree_skb(skb); }