From: Luis R. Rodriguez Date: Tue, 18 Aug 2009 23:24:49 +0000 (-0700) Subject: Update patch offesets to apply cleanly X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=53a557e6601fb99de65fe972afeb332e240c14bf;p=openwrt%2Fstaging%2Fblogic.git Update patch offesets to apply cleanly Signed-off-by: Luis R. Rodriguez --- diff --git a/compat/patches/01-netdev.patch b/compat/patches/01-netdev.patch index 3c4e6bb8a90c..931f0ea84bbf 100644 --- a/compat/patches/01-netdev.patch +++ b/compat/patches/01-netdev.patch @@ -36,9 +36,9 @@ without creating a headache on maintenance of the pathes. retval = rndis_command(dev, u.header, CONTROL_BUFFER_SIZE); if (unlikely(retval < 0)) { ---- a/drivers/net/usb/usbnet.c 2009-08-04 10:28:16.310023000 -0700 -+++ b/drivers/net/usb/usbnet.c 2009-08-04 10:28:16.410010646 -0700 -@@ -1155,6 +1155,7 @@ +--- a/drivers/net/usb/usbnet.c 2009-08-18 16:13:32.161376062 -0700 ++++ b/drivers/net/usb/usbnet.c 2009-08-18 16:13:32.761354961 -0700 +@@ -1196,6 +1196,7 @@ } EXPORT_SYMBOL_GPL(usbnet_disconnect); @@ -46,7 +46,7 @@ without creating a headache on maintenance of the pathes. static const struct net_device_ops usbnet_netdev_ops = { .ndo_open = usbnet_open, .ndo_stop = usbnet_stop, -@@ -1164,6 +1165,7 @@ +@@ -1205,6 +1206,7 @@ .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, }; @@ -54,7 +54,7 @@ without creating a headache on maintenance of the pathes. /*-------------------------------------------------------------------------*/ -@@ -1233,7 +1235,15 @@ +@@ -1275,7 +1277,15 @@ net->features |= NETIF_F_HIGHDMA; #endif @@ -70,9 +70,9 @@ without creating a headache on maintenance of the pathes. net->watchdog_timeo = TX_TIMEOUT_JIFFIES; net->ethtool_ops = &usbnet_ethtool_ops; ---- a/drivers/net/wireless/rndis_wlan.c 2009-08-10 16:57:41.535486388 -0700 -+++ b/drivers/net/wireless/rndis_wlan.c 2009-08-10 16:57:41.903464012 -0700 -@@ -2789,6 +2789,7 @@ +--- a/drivers/net/wireless/rndis_wlan.c 2009-08-18 16:15:04.501372272 -0700 ++++ b/drivers/net/wireless/rndis_wlan.c 2009-08-18 16:15:04.621354357 -0700 +@@ -2800,6 +2800,7 @@ static int bcm4320b_early_init(struct us return 0; } @@ -80,7 +80,7 @@ without creating a headache on maintenance of the pathes. /* same as rndis_netdev_ops but with local multicast handler */ static const struct net_device_ops rndis_wlan_netdev_ops = { .ndo_open = usbnet_open, -@@ -2799,6 +2800,7 @@ +@@ -2810,6 +2811,7 @@ static const struct net_device_ops rndis .ndo_validate_addr = eth_validate_addr, .ndo_set_multicast_list = rndis_wlan_set_multicast_list, }; @@ -88,7 +88,7 @@ without creating a headache on maintenance of the pathes. static int rndis_wlan_bind(struct usbnet *usbdev, struct usb_interface *intf) -@@ -2849,7 +2851,11 @@ +@@ -2860,7 +2862,11 @@ static int rndis_wlan_bind(struct usbnet * rndis_host wants to avoid all OID as much as possible * so do promisc/multicast handling in rndis_wlan. */ @@ -100,9 +100,9 @@ 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 2009-08-04 10:36:02.971020795 -0700 -+++ b/net/mac80211/iface.c 2009-08-04 10:36:03.459024595 -0700 -@@ -684,6 +684,7 @@ +--- a/net/mac80211/iface.c 2009-08-18 16:16:16.321354483 -0700 ++++ b/net/mac80211/iface.c 2009-08-18 16:16:17.205374108 -0700 +@@ -675,6 +675,7 @@ static void ieee80211_teardown_sdata(str WARN_ON(flushed); } @@ -110,7 +110,7 @@ without creating a headache on maintenance of the pathes. static const struct net_device_ops ieee80211_dataif_ops = { .ndo_open = ieee80211_open, .ndo_stop = ieee80211_stop, -@@ -703,11 +704,22 @@ +@@ -694,11 +695,22 @@ static const struct net_device_ops ieee8 .ndo_change_mtu = ieee80211_change_mtu, .ndo_set_mac_address = eth_mac_addr, }; @@ -133,7 +133,7 @@ without creating a headache on maintenance of the pathes. dev->destructor = free_netdev; } -@@ -722,7 +734,11 @@ +@@ -713,7 +725,11 @@ static void ieee80211_setup_sdata(struct /* and set some type-dependent values */ sdata->vif.type = type; @@ -145,7 +145,7 @@ without creating a headache on maintenance of the pathes. sdata->wdev.iftype = type; /* only monitor differs */ -@@ -745,7 +761,11 @@ +@@ -736,7 +752,11 @@ static void ieee80211_setup_sdata(struct break; case NL80211_IFTYPE_MONITOR: sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP; @@ -157,7 +157,7 @@ without creating a headache on maintenance of the pathes. sdata->u.mntr_flags = MONITOR_FLAG_CONTROL | MONITOR_FLAG_OTHER_BSS; break; -@@ -812,6 +832,8 @@ +@@ -803,6 +823,8 @@ int ieee80211_if_add(struct ieee80211_lo return -ENOMEM; dev_net_set(ndev, wiphy_net(local->hw.wiphy)); @@ -166,7 +166,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 */ -@@ -820,6 +842,7 @@ +@@ -811,6 +833,7 @@ int ieee80211_if_add(struct ieee80211_lo - ETH_HLEN /* ethernet hard_header_len */ + IEEE80211_ENCRYPT_HEADROOM; ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; @@ -174,7 +174,7 @@ without creating a headache on maintenance of the pathes. ret = dev_alloc_name(ndev, ndev->name); if (ret < 0) -@@ -852,6 +875,10 @@ +@@ -843,6 +866,10 @@ int ieee80211_if_add(struct ieee80211_lo if (ret) goto fail; @@ -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 -+++ b/drivers/net/wireless/libertas/main.c -@@ -1148,6 +1148,7 @@ static void lbs_free_adapter(struct lbs_private *priv) +--- a/drivers/net/wireless/libertas/main.c 2009-08-18 16:17:34.669375612 -0700 ++++ b/drivers/net/wireless/libertas/main.c 2009-08-18 16:17:35.277375431 -0700 +@@ -1148,6 +1148,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, -@@ -1158,6 +1159,7 @@ static const struct net_device_ops lbs_netdev_ops = { +@@ -1158,6 +1159,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 -@@ -1193,7 +1195,16 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev) +@@ -1193,7 +1195,16 @@ priv->infra_open = 0; /* Setup the OS Interface to our functions */ @@ -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 -@@ -1419,6 +1430,7 @@ out: +@@ -1420,6 +1431,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, -@@ -1426,6 +1438,7 @@ static const struct net_device_ops mesh_netdev_ops = { +@@ -1427,6 +1439,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 -@@ -1449,7 +1462,15 @@ static int lbs_add_mesh(struct lbs_private *priv) +@@ -1450,7 +1463,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)); -@@ -1664,11 +1685,13 @@ out: +@@ -1665,11 +1686,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) { -@@ -1689,7 +1712,13 @@ static int lbs_add_rtap(struct lbs_private *priv) +@@ -1690,7 +1713,13 @@ memcpy(rtap_dev->dev_addr, priv->current_addr, ETH_ALEN); rtap_dev->type = ARPHRD_IEEE80211_RADIOTAP; @@ -509,9 +509,9 @@ without creating a headache on maintenance of the pathes. #define LBS_DEB_ENTER 0x00000001 #define LBS_DEB_LEAVE 0x00000002 ---- a/drivers/net/wireless/mac80211_hwsim.c -+++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -814,16 +814,22 @@ static struct device_driver mac80211_hwsim_driver = { +--- a/drivers/net/wireless/mac80211_hwsim.c 2009-08-18 16:18:52.829350750 -0700 ++++ b/drivers/net/wireless/mac80211_hwsim.c 2009-08-18 16:18:52.977352457 -0700 +@@ -812,16 +812,22 @@ .name = "mac80211_hwsim" }; diff --git a/compat/patches/02-ksize.patch b/compat/patches/02-ksize.patch index 42f802f1561d..219bb7b82ff2 100644 --- a/compat/patches/02-ksize.patch +++ b/compat/patches/02-ksize.patch @@ -10,9 +10,9 @@ define ksize(bleh) SOME_LARGE_NUMBER but doing it this way emphasis careful review of the situation. ---- a/net/wireless/scan.c 2009-08-04 10:39:49.110993204 -0700 -+++ b/net/wireless/scan.c 2009-08-04 10:39:49.619023920 -0700 -@@ -401,7 +401,11 @@ +--- a/net/wireless/scan.c 2009-08-18 16:22:44.489362784 -0700 ++++ b/net/wireless/scan.c 2009-08-18 16:22:45.557376042 -0700 +@@ -407,7 +407,11 @@ size_t used = dev->wiphy.bss_priv_size + sizeof(*res); size_t ielen = res->pub.len_information_elements; diff --git a/compat/patches/03-rfkill.patch b/compat/patches/03-rfkill.patch index 7c2c394580fe..6b9f11dc4bb9 100644 --- a/compat/patches/03-rfkill.patch +++ b/compat/patches/03-rfkill.patch @@ -185,9 +185,9 @@ just keep /dev/rfkill and not /dev/rfkill_backport. #include #include #include ---- a/drivers/net/wireless/ath/ath9k/hw.c 2009-08-04 11:07:27.734023469 -0700 -+++ b/drivers/net/wireless/ath/ath9k/hw.c 2009-08-04 11:07:28.482002411 -0700 -@@ -3601,7 +3601,7 @@ +--- a/drivers/net/wireless/ath/ath9k/hw.c 2009-08-18 16:21:06.969354721 -0700 ++++ b/drivers/net/wireless/ath/ath9k/hw.c 2009-08-18 16:21:07.893353370 -0700 +@@ -3615,7 +3615,7 @@ pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM; diff --git a/compat/patches/06-header-changes.patch b/compat/patches/06-header-changes.patch index 00a3eecf92fc..b2e8fd8e465c 100644 --- a/compat/patches/06-header-changes.patch +++ b/compat/patches/06-header-changes.patch @@ -40,8 +40,8 @@ cases. #include #include ---- a/net/mac80211/driver-trace.h -+++ b/net/mac80211/driver-trace.h +--- a/net/mac80211/driver-trace.h 2009-08-18 16:19:34.574352433 -0700 ++++ b/net/mac80211/driver-trace.h 2009-08-18 16:19:35.694367614 -0700 @@ -1,7 +1,9 @@ #if !defined(__MAC80211_DRIVER_TRACE) || defined(TRACE_HEADER_MULTI_READ) #define __MAC80211_DRIVER_TRACE @@ -52,7 +52,7 @@ cases. #include #include "ieee80211_i.h" -@@ -645,4 +647,6 @@ TRACE_EVENT(drv_ampdu_action, +@@ -669,4 +671,6 @@ TRACE_EVENT(drv_ampdu_action, #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE driver-trace