From: Luis R. Rodriguez Date: Sat, 28 Apr 2012 03:01:19 +0000 (-0700) Subject: compat-wireless: refresh patches for next-20120427 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e58cfec781ca88ffba9b027fbe1c2bd9a0d08f9a;p=openwrt%2Fstaging%2Fblogic.git compat-wireless: refresh patches for next-20120427 Signed-off-by: Luis R. Rodriguez --- diff --git a/patches/0001-netdev_ops.patch b/patches/0001-netdev_ops.patch index 55f5bf83e769..10f189ad87da 100644 --- a/patches/0001-netdev_ops.patch +++ b/patches/0001-netdev_ops.patch @@ -201,7 +201,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 atl1e_set_ethtool_ops(netdev); --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -2465,7 +2465,7 @@ static int atl1c_init_netdev(struct net_ +@@ -2345,7 +2345,7 @@ static int atl1c_init_netdev(struct net_ SET_NETDEV_DEV(netdev, &pdev->dev); pci_set_drvdata(pdev, netdev); diff --git a/patches/0003-netdev-needed_headroom_tailroom.patch b/patches/0003-netdev-needed_headroom_tailroom.patch index b848a1bc1906..7bcc86337c80 100644 --- a/patches/0003-netdev-needed_headroom_tailroom.patch +++ b/patches/0003-netdev-needed_headroom_tailroom.patch @@ -4,7 +4,7 @@ could be used. --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1282,6 +1282,7 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -1294,6 +1294,7 @@ int ieee80211_if_add(struct ieee80211_lo return -ENOMEM; dev_net_set(ndev, wiphy_net(local->hw.wiphy)); @@ -12,7 +12,7 @@ could be used. ndev->needed_headroom = local->tx_headroom + 4*6 /* four MAC addresses */ + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */ -@@ -1290,6 +1291,7 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -1302,6 +1303,7 @@ int ieee80211_if_add(struct ieee80211_lo - ETH_HLEN /* ethernet hard_header_len */ + IEEE80211_ENCRYPT_HEADROOM; ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index de9105401371..fb5d5668c7d8 100644 --- a/patches/11-dev-pm-ops.patch +++ b/patches/11-dev-pm-ops.patch @@ -35,7 +35,7 @@ calls on compat code with only slight modifications. int __init bcma_host_pci_init(void) --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -2741,6 +2741,9 @@ static struct pci_error_handlers atl1c_e +@@ -2620,6 +2620,9 @@ static struct pci_error_handlers atl1c_e static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume); @@ -45,7 +45,7 @@ calls on compat code with only slight modifications. static struct pci_driver atl1c_driver = { .name = atl1c_driver_name, .id_table = atl1c_pci_tbl, -@@ -2748,7 +2751,12 @@ static struct pci_driver atl1c_driver = +@@ -2627,7 +2630,12 @@ static struct pci_driver atl1c_driver = .remove = __devexit_p(atl1c_remove), .shutdown = atl1c_shutdown, .err_handler = &atl1c_err_handler, diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch index bd3e5daec4da..e5ca197ba663 100644 --- a/patches/16-bluetooth.patch +++ b/patches/16-bluetooth.patch @@ -508,7 +508,7 @@ here still, but for now we keep this here. struct rfcomm_dlc *dlc = dev->dlc; --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c -@@ -439,8 +439,12 @@ static struct sock *sco_sock_alloc(struc +@@ -440,8 +440,12 @@ static struct sock *sco_sock_alloc(struc return sk; } @@ -521,7 +521,7 @@ here still, but for now we keep this here. { struct sock *sk; -@@ -669,7 +673,11 @@ static int sco_sock_sendmsg(struct kiocb +@@ -670,7 +674,11 @@ static int sco_sock_sendmsg(struct kiocb return err; } diff --git a/patches/17-netdev-queue.patch b/patches/17-netdev-queue.patch index f52c61cb3776..284e162c905f 100644 --- a/patches/17-netdev-queue.patch +++ b/patches/17-netdev-queue.patch @@ -14,7 +14,7 @@ The patch that introduced this on mac80211 was: --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1382,6 +1382,7 @@ void ieee80211_if_remove(struct ieee8021 +@@ -1394,6 +1394,7 @@ void ieee80211_if_remove(struct ieee8021 * Remove all interfaces, may only be called at hardware unregistration * time because it doesn't do RCU-safe list removals. */ @@ -22,7 +22,7 @@ The patch that introduced this on mac80211 was: void ieee80211_remove_interfaces(struct ieee80211_local *local) { struct ieee80211_sub_if_data *sdata, *tmp; -@@ -1402,6 +1403,22 @@ void ieee80211_remove_interfaces(struct +@@ -1413,6 +1414,22 @@ void ieee80211_remove_interfaces(struct unregister_netdevice_many(&unreg_list); list_del(&unreg_list); } diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index c292f6ff8944..6653b1b20b72 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -13,7 +13,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -413,7 +413,11 @@ static void atl1c_set_multi(struct net_d +@@ -394,7 +394,11 @@ static void atl1c_set_multi(struct net_d /* comoute mc addresses' hash value ,and put it into hash table */ netdev_for_each_mc_addr(ha, netdev) { @@ -741,7 +741,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 spin_unlock_bh(&local->filter_lock); netif_addr_unlock_bh(sdata->dev); -@@ -741,7 +746,12 @@ static void ieee80211_set_multicast_list +@@ -743,7 +748,12 @@ static void ieee80211_set_multicast_list sdata->flags ^= IEEE80211_SDATA_PROMISC; } spin_lock_bh(&local->filter_lock); diff --git a/patches/40-netdev-hw-features.patch b/patches/40-netdev-hw-features.patch index e553060914b1..40df3885326c 100644 --- a/patches/40-netdev-hw-features.patch +++ b/patches/40-netdev-hw-features.patch @@ -48,7 +48,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 void atl1c_set_ethtool_ops(struct net_device *netdev) --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -495,6 +495,7 @@ static void atl1c_set_rxbufsize(struct a +@@ -476,6 +476,7 @@ static void atl1c_set_rxbufsize(struct a roundup(mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN, 8) : AT_RX_BUF_SIZE; } @@ -56,7 +56,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 static netdev_features_t atl1c_fix_features(struct net_device *netdev, netdev_features_t features) { -@@ -523,6 +524,7 @@ static int atl1c_set_features(struct net +@@ -504,6 +505,7 @@ static int atl1c_set_features(struct net return 0; } @@ -64,7 +64,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 /* * atl1c_change_mtu - Change the Maximum Transfer Unit -@@ -555,8 +557,19 @@ static int atl1c_change_mtu(struct net_d +@@ -536,8 +538,19 @@ static int atl1c_change_mtu(struct net_d netdev->mtu = new_mtu; adapter->hw.max_frame_size = new_mtu; atl1c_set_rxbufsize(adapter, netdev); @@ -84,7 +84,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 atl1c_up(adapter); clear_bit(__AT_RESETTING, &adapter->flags); if (adapter->hw.ctrl_flags & ATL1C_FPGA_VERSION) { -@@ -2454,8 +2467,10 @@ static const struct net_device_ops atl1c +@@ -2334,8 +2347,10 @@ static const struct net_device_ops atl1c .ndo_set_mac_address = atl1c_set_mac_addr, .ndo_set_rx_mode = atl1c_set_multi, .ndo_change_mtu = atl1c_change_mtu, @@ -95,7 +95,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 .ndo_do_ioctl = atl1c_ioctl, .ndo_tx_timeout = atl1c_tx_timeout, .ndo_get_stats = atl1c_get_stats, -@@ -2474,6 +2489,7 @@ static int atl1c_init_netdev(struct net_ +@@ -2354,6 +2369,7 @@ static int atl1c_init_netdev(struct net_ atl1c_set_ethtool_ops(netdev); /* TODO: add when ready */ @@ -103,7 +103,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 netdev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HW_VLAN_RX | -@@ -2481,6 +2497,14 @@ static int atl1c_init_netdev(struct net_ +@@ -2361,6 +2377,14 @@ static int atl1c_init_netdev(struct net_ NETIF_F_TSO6; netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_TX; diff --git a/patches/46-use_other_workqueue.patch b/patches/46-use_other_workqueue.patch index 7c63b8264859..3e55e1d66a46 100644 --- a/patches/46-use_other_workqueue.patch +++ b/patches/46-use_other_workqueue.patch @@ -4,7 +4,7 @@ position before. --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c -@@ -1811,8 +1811,12 @@ int hci_register_dev(struct hci_dev *hde +@@ -1740,8 +1740,12 @@ int hci_register_dev(struct hci_dev *hde write_unlock(&hci_dev_list_lock); diff --git a/patches/61-netdev-addr_assign_type.patch b/patches/61-netdev-addr_assign_type.patch index 0810638c8a04..da47c60d85ed 100644 --- a/patches/61-netdev-addr_assign_type.patch +++ b/patches/61-netdev-addr_assign_type.patch @@ -7,7 +7,7 @@ v2.6.36-rc1~571^2~104 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -479,7 +479,9 @@ static int atl1c_set_mac_addr(struct net +@@ -460,7 +460,9 @@ static int atl1c_set_mac_addr(struct net memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); memcpy(adapter->hw.mac_addr, addr->sa_data, netdev->addr_len); @@ -17,7 +17,7 @@ v2.6.36-rc1~571^2~104 atl1c_hw_set_mac_addr(&adapter->hw); -@@ -2619,7 +2621,9 @@ static int __devinit atl1c_probe(struct +@@ -2498,7 +2500,9 @@ static int __devinit atl1c_probe(struct } if (atl1c_read_mac_addr(&adapter->hw)) { /* got a random MAC address, set NET_ADDR_RANDOM to netdev */