From 9c4c504b6763e695957ae5325bca856288d42370 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 10 May 2010 15:26:17 -0700 Subject: [PATCH] ./scripts/admin-update.sh refresh Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 30 +++++++++++------------ patches/04-netns.patch | 2 +- patches/12-iw_handler-changes.patch | 4 +-- patches/25-multicast-list_head.patch | 14 +++++------ patches/26-sdio-quirks.patch | 4 +-- patches/27-hermes-read-pda-conflict.patch | 2 +- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index a185111f0ed7..12dded319b63 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -111,7 +111,7 @@ without creating a headache on maintenance of the pathes. ieee80211_sdata_set_mesh_id(sdata, --- a/drivers/net/b44.c +++ b/drivers/net/b44.c -@@ -2164,7 +2164,7 @@ +@@ -2164,7 +2164,7 @@ static int __devinit b44_init_one(struct bp->rx_pending = B44_DEF_RX_RING_PENDING; bp->tx_pending = B44_DEF_TX_RING_PENDING; @@ -190,7 +190,7 @@ without creating a headache on maintenance of the pathes. --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c -@@ -6126,7 +6126,7 @@ +@@ -6127,7 +6127,7 @@ static struct net_device *ipw2100_alloc_ priv->ieee->perfect_rssi = -20; priv->ieee->worst_rssi = -85; @@ -201,7 +201,7 @@ without creating a headache on maintenance of the pathes. priv->wireless_data.libipw = priv->ieee; --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c -@@ -11687,7 +11687,7 @@ +@@ -11687,7 +11687,7 @@ static int ipw_prom_alloc(struct ipw_pri memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN); priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP; @@ -210,7 +210,7 @@ without creating a headache on maintenance of the pathes. priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR; SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev); -@@ -11826,7 +11826,7 @@ +@@ -11826,7 +11826,7 @@ static int __devinit ipw_pci_probe(struc priv->ieee->perfect_rssi = -20; priv->ieee->worst_rssi = -85; @@ -221,7 +221,7 @@ without creating a headache on maintenance of the pathes. net_dev->wireless_handlers = &ipw_wx_handler_def; --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c -@@ -942,7 +942,7 @@ +@@ -942,7 +942,7 @@ struct lbs_private *lbs_add_card(void *c wdev->netdev = dev; priv->dev = dev; @@ -230,7 +230,7 @@ without creating a headache on maintenance of the pathes. dev->watchdog_timeo = 5 * HZ; dev->ethtool_ops = &lbs_ethtool_ops; #ifdef WIRELESS_EXT -@@ -1273,7 +1273,7 @@ +@@ -1273,7 +1273,7 @@ static int lbs_add_rtap(struct lbs_priva memcpy(rtap_dev->dev_addr, priv->current_addr, ETH_ALEN); rtap_dev->type = ARPHRD_IEEE80211_RADIOTAP; @@ -241,7 +241,7 @@ without creating a headache on maintenance of the pathes. --- a/drivers/net/wireless/libertas/mesh.c +++ b/drivers/net/wireless/libertas/mesh.c -@@ -363,7 +363,7 @@ +@@ -363,7 +363,7 @@ int lbs_add_mesh(struct lbs_private *pri mesh_dev->ml_priv = priv; priv->mesh_dev = mesh_dev; @@ -269,7 +269,7 @@ without creating a headache on maintenance of the pathes. #define LBS_DEB_LEAVE 0x00000002 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -1087,7 +1087,7 @@ +@@ -1088,7 +1088,7 @@ static const struct net_device_ops hwsim static void hwsim_mon_setup(struct net_device *dev) { @@ -280,7 +280,7 @@ without creating a headache on maintenance of the pathes. dev->tx_queue_len = 0; --- a/drivers/net/wireless/orinoco/main.c +++ b/drivers/net/wireless/orinoco/main.c -@@ -2228,9 +2228,9 @@ int orinoco_if_add(struct orinoco_privat +@@ -2271,9 +2271,9 @@ int orinoco_if_add(struct orinoco_privat #endif /* Default to standard ops if not set */ if (ops) @@ -294,7 +294,7 @@ without creating a headache on maintenance of the pathes. --- a/net/bluetooth/bnep/netdev.c +++ b/net/bluetooth/bnep/netdev.c -@@ -168,8 +168,12 @@ +@@ -168,8 +168,12 @@ static inline int bnep_net_proto_filter( } #endif @@ -309,7 +309,7 @@ without creating a headache on maintenance of the pathes. { struct bnep_session *s = netdev_priv(dev); struct sock *sk = s->sock->sk; -@@ -229,7 +233,7 @@ +@@ -229,7 +233,7 @@ void bnep_net_setup(struct net_device *d dev->addr_len = ETH_ALEN; ether_setup(dev); @@ -320,7 +320,7 @@ without creating a headache on maintenance of the pathes. } --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c -@@ -2225,7 +2225,7 @@ +@@ -2225,7 +2225,7 @@ static int atl1e_init_netdev(struct net_ pci_set_drvdata(pdev, netdev); netdev->irq = pdev->irq; @@ -331,7 +331,7 @@ without creating a headache on maintenance of the pathes. atl1e_set_ethtool_ops(netdev); --- a/drivers/net/atl1c/atl1c_main.c +++ b/drivers/net/atl1c/atl1c_main.c -@@ -2556,7 +2556,7 @@ +@@ -2556,7 +2556,7 @@ static int atl1c_init_netdev(struct net_ pci_set_drvdata(pdev, netdev); netdev->irq = pdev->irq; @@ -342,7 +342,7 @@ without creating a headache on maintenance of the pathes. --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c -@@ -2981,7 +2981,7 @@ +@@ -2981,7 +2981,7 @@ static int __devinit atl1_probe(struct p adapter->mii.phy_id_mask = 0x1f; adapter->mii.reg_num_mask = 0x1f; @@ -353,7 +353,7 @@ without creating a headache on maintenance of the pathes. netdev->ethtool_ops = &atl1_ethtool_ops; --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c -@@ -1395,7 +1395,7 @@ +@@ -1395,7 +1395,7 @@ static int __devinit atl2_probe(struct p atl2_setup_pcicmd(pdev); diff --git a/patches/04-netns.patch b/patches/04-netns.patch index 18f8c85b8b51..84deeabc33bb 100644 --- a/patches/04-netns.patch +++ b/patches/04-netns.patch @@ -16,7 +16,7 @@ files... }; /* internal helper: get rdev and dev */ -@@ -4207,7 +4209,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -4294,7 +4296,9 @@ static int nl80211_wiphy_netns(struct sk err = cfg80211_switch_netns(rdev, net); out_put_net: diff --git a/patches/12-iw_handler-changes.patch b/patches/12-iw_handler-changes.patch index ffbc2cbfbbb5..0c525d1b7e94 100644 --- a/patches/12-iw_handler-changes.patch +++ b/patches/12-iw_handler-changes.patch @@ -1,7 +1,7 @@ --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c -@@ -6140,7 +6140,11 @@ static struct net_device *ipw2100_alloc_ - +@@ -6130,7 +6130,11 @@ static struct net_device *ipw2100_alloc_ + netdev_attach_ops(dev, &ipw2100_netdev_ops); dev->ethtool_ops = &ipw2100_ethtool_ops; dev->wireless_handlers = &ipw2100_wx_handler_def; +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 99342a2bfd85..3f345e74d17d 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -124,7 +124,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return mc_filter[0] | ((u64)(mc_filter[1]) << 32); --- a/drivers/net/wireless/ath/ar9170/main.c +++ b/drivers/net/wireless/ath/ar9170/main.c -@@ -2046,17 +2046,35 @@ out: +@@ -1620,17 +1620,35 @@ out: return err; } @@ -266,7 +266,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/drivers/net/wireless/libertas_tf/main.c +++ b/drivers/net/wireless/libertas_tf/main.c -@@ -418,20 +418,36 @@ static int lbtf_op_config(struct ieee802 +@@ -419,20 +419,36 @@ static int lbtf_op_config(struct ieee802 } static u64 lbtf_op_prepare_multicast(struct ieee80211_hw *hw, @@ -433,8 +433,8 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/drivers/net/wireless/rtl818x/rtl8180_dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c -@@ -725,10 +725,19 @@ static void rtl8180_bss_info_changed(str - priv->rf->conf_erp(dev, info); +@@ -803,10 +803,19 @@ static void rtl8180_bss_info_changed(str + } } +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) @@ -475,7 +475,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 static void rtl8187_configure_filter(struct ieee80211_hw *dev, --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c -@@ -1344,11 +1344,20 @@ struct wl1271_filter_params { +@@ -1360,11 +1360,20 @@ struct wl1271_filter_params { u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN]; }; @@ -496,7 +496,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 struct wl1271 *wl = hw->priv; if (unlikely(wl->state == WL1271_STATE_OFF)) -@@ -1361,16 +1370,40 @@ static u64 wl1271_op_prepare_multicast(s +@@ -1377,16 +1386,40 @@ static u64 wl1271_op_prepare_multicast(s } /* update multicast filtering parameters */ @@ -576,7 +576,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return hash.low | ((u64)hash.high << 32); --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -1640,7 +1640,11 @@ struct ieee80211_ops { +@@ -1646,7 +1646,11 @@ struct ieee80211_ops { struct ieee80211_bss_conf *info, u32 changed); u64 (*prepare_multicast)(struct ieee80211_hw *hw, diff --git a/patches/26-sdio-quirks.patch b/patches/26-sdio-quirks.patch index 133e9bb60d8b..1fd80389e1b4 100644 --- a/patches/26-sdio-quirks.patch +++ b/patches/26-sdio-quirks.patch @@ -2,7 +2,7 @@ The quirks attribute is not available on older kernels. --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c -@@ -1005,6 +1005,7 @@ static int if_sdio_probe(struct sdio_fun +@@ -1025,6 +1025,7 @@ static int if_sdio_probe(struct sdio_fun if (ret) goto disable; @@ -10,7 +10,7 @@ The quirks attribute is not available on older kernels. /* For 1-bit transfers to the 8686 model, we need to enable the * interrupt flag in the CCCR register. Set the MMC_QUIRK_LENIENT_FN0 * bit to allow access to non-vendor registers. */ -@@ -1023,6 +1024,7 @@ static int if_sdio_probe(struct sdio_fun +@@ -1043,6 +1044,7 @@ static int if_sdio_probe(struct sdio_fun if (ret) goto release_int; } diff --git a/patches/27-hermes-read-pda-conflict.patch b/patches/27-hermes-read-pda-conflict.patch index fe6b18164009..43afdeef4bd4 100644 --- a/patches/27-hermes-read-pda-conflict.patch +++ b/patches/27-hermes-read-pda-conflict.patch @@ -45,7 +45,7 @@ define for something else in arch/um/include/asm/pda.h on older kernels. int (*program_end)(struct hermes *hw); --- a/drivers/net/wireless/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/orinoco/orinoco_usb.c -@@ -1556,7 +1556,7 @@ static const struct hermes_ops ezusb_ops +@@ -1551,7 +1551,7 @@ static const struct hermes_ops ezusb_ops .read_ltv = ezusb_read_ltv, .write_ltv = ezusb_write_ltv, .bap_pread = ezusb_bap_pread, -- 2.30.2