Skip to content

Commit

Permalink
compat-wireless: refresh patches
Browse files Browse the repository at this point in the history 
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
  • Loading branch information
Luis R. Rodriguez committed Jun 23, 2011
1 parent ea3350b commit 3afe4bf
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions patches/01-netdev.patch
View file
Expand Up @@ -325,7 +325,7 @@ without creating a headache on maintenance of the pathes.
}
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -2212,7 +2212,7 @@ static int atl1e_init_netdev(struct net_
@@ -2211,7 +2211,7 @@ static int atl1e_init_netdev(struct net_
pci_set_drvdata(pdev, netdev);

netdev->irq = pdev->irq;
Expand Down Expand Up @@ -358,7 +358,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
@@ -1394,7 +1394,7 @@ static int __devinit atl2_probe(struct p
@@ -1393,7 +1393,7 @@ static int __devinit atl2_probe(struct p

atl2_setup_pcicmd(pdev);

Expand Down
2 changes: 1 addition & 1 deletion patches/04-netns.patch
View file
Expand Up @@ -6,7 +6,7 @@ files...

--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4657,7 +4657,9 @@ static int nl80211_wiphy_netns(struct sk
@@ -4661,7 +4661,9 @@ static int nl80211_wiphy_netns(struct sk
if (!net_eq(wiphy_net(&rdev->wiphy), net))
err = cfg80211_switch_netns(rdev, net);

Expand Down
8 changes: 4 additions & 4 deletions patches/09-threaded-irq.patch
View file
Expand Up @@ -6,7 +6,7 @@ thread in process context as well.

--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -3984,8 +3984,13 @@ redo:
@@ -3985,8 +3985,13 @@ redo:
if (b43_bus_host_is_sdio(dev->dev)) {
b43_sdio_free_irq(dev);
} else {
Expand All @@ -20,7 +20,7 @@ thread in process context as well.
}
mutex_lock(&wl->mutex);
dev = wl->current_dev;
@@ -4025,9 +4030,17 @@ static int b43_wireless_core_start(struc
@@ -4026,9 +4031,17 @@ static int b43_wireless_core_start(struc
goto out;
}
} else {
Expand All @@ -38,7 +38,7 @@ thread in process context as well.
if (err) {
b43err(dev->wl, "Cannot request IRQ-%d\n",
dev->dev->irq);
@@ -4744,6 +4757,10 @@ static int b43_setup_bands(struct b43_wl
@@ -4755,6 +4768,10 @@ static int b43_setup_bands(struct b43_wl

static void b43_wireless_core_detach(struct b43_wldev *dev)
{
Expand All @@ -51,7 +51,7 @@ thread in process context as well.
b43_release_firmware(dev);
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -786,6 +786,9 @@ struct b43_wldev {
@@ -792,6 +792,9 @@ struct b43_wldev {
unsigned int tx_count;
unsigned int rx_count;
#endif
Expand Down
4 changes: 2 additions & 2 deletions patches/16-bluetooth.patch
View file
Expand Up @@ -94,7 +94,7 @@ here still, but for now we keep this here.
}
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -605,7 +605,11 @@ drop:
@@ -547,7 +547,11 @@ drop:
goto done;
}

Expand All @@ -106,7 +106,7 @@ here still, but for now we keep this here.
{
struct hci_ufilter uf = { .opcode = 0 };
struct sock *sk = sock->sk;
@@ -760,8 +764,12 @@ static struct proto hci_sk_proto = {
@@ -702,8 +706,12 @@ static struct proto hci_sk_proto = {
.obj_size = sizeof(struct hci_pinfo)
};

Expand Down
2 changes: 1 addition & 1 deletion patches/18-rename-usb-net-symbols.patch
View file
Expand Up @@ -28,7 +28,7 @@ Remove this patch if these symbols are backported.
+obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o
obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o
obj-$(CONFIG_USB_CDC_PHONET) += cdc-phonet.o
obj-$(CONFIG_USB_IPHETH) += ipheth.o
obj-$(CONFIG_USB_NET_KALMIA) += kalmia.o
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -33,7 +33,7 @@
Expand Down
18 changes: 9 additions & 9 deletions patches/25-multicast-list_head.patch
View file
Expand Up @@ -124,7 +124,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
return mc_filter[0] | ((u64)(mc_filter[1]) << 32);
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
@@ -331,20 +331,42 @@ ath5k_bss_info_changed(struct ieee80211_
@@ -329,20 +329,42 @@ ath5k_bss_info_changed(struct ieee80211_

static u64
ath5k_prepare_multicast(struct ieee80211_hw *hw,
Expand Down Expand Up @@ -167,7 +167,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
pos &= 0x3f;
mfilt[pos / 32] |= (1 << (pos % 32));
@@ -353,6 +375,9 @@ ath5k_prepare_multicast(struct ieee80211
@@ -351,6 +373,9 @@ ath5k_prepare_multicast(struct ieee80211
* neet to inform below to not reset the mcast */
/* ath5k_hw_set_mcast_filterindex(ah,
* ha->addr[5]); */
Expand Down Expand Up @@ -325,7 +325,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
p += sprintf(p, "num_tx_bytes = %lu\n", priv->stats.tx_bytes);
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -2538,15 +2538,21 @@ struct mwl8k_cmd_mac_multicast_adr {
@@ -2540,15 +2540,21 @@ struct mwl8k_cmd_mac_multicast_adr {

static struct mwl8k_cmd_pkt *
__mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti,
Expand All @@ -347,7 +347,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856

if (allmulti || mc_count > priv->num_mcaddrs) {
allmulti = 1;
@@ -2567,13 +2573,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee
@@ -2569,13 +2575,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee
if (allmulti) {
cmd->action |= cpu_to_le16(MWL8K_ENABLE_RX_ALL_MULTICAST);
} else if (mc_count) {
Expand Down Expand Up @@ -375,7 +375,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
}
}

@@ -4724,7 +4744,11 @@ mwl8k_bss_info_changed(struct ieee80211_
@@ -4726,7 +4746,11 @@ mwl8k_bss_info_changed(struct ieee80211_
}

static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw,
Expand All @@ -387,7 +387,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
{
struct mwl8k_cmd_pkt *cmd;

@@ -4735,7 +4759,11 @@ static u64 mwl8k_prepare_multicast(struc
@@ -4737,7 +4761,11 @@ static u64 mwl8k_prepare_multicast(struc
* we'll end up throwing this packet away and creating a new
* one in mwl8k_configure_filter().
*/
Expand All @@ -399,7 +399,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856

return (unsigned long)cmd;
}
@@ -4857,7 +4885,11 @@ static void mwl8k_configure_filter(struc
@@ -4859,7 +4887,11 @@ static void mwl8k_configure_filter(struc
*/
if (*total_flags & FIF_ALLMULTI) {
kfree(cmd);
Expand Down Expand Up @@ -604,7 +604,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
return (u64)(unsigned long)fp;
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -1126,17 +1126,34 @@ static void zd_process_intr(struct work_
@@ -1195,17 +1195,34 @@ static void zd_process_intr(struct work_


static u64 zd_op_prepare_multicast(struct ieee80211_hw *hw,
Expand Down Expand Up @@ -655,7 +655,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
}
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1883,7 +1883,11 @@ struct ieee80211_ops {
@@ -1891,7 +1891,11 @@ struct ieee80211_ops {
struct ieee80211_bss_conf *info,
u32 changed);
u64 (*prepare_multicast)(struct ieee80211_hw *hw,
Expand Down
2 changes: 1 addition & 1 deletion patches/31-backport-sk_add_backlog.patch
View file
Expand Up @@ -9,7 +9,7 @@ backlog.

--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -3905,8 +3905,12 @@ static inline int l2cap_data_channel(str
@@ -3898,8 +3898,12 @@ static inline int l2cap_data_channel(str
if (!sock_owned_by_user(sk)) {
l2cap_ertm_data_rcv(sk, skb);
} else {
Expand Down
2 changes: 1 addition & 1 deletion patches/38-led-max-brightness.patch
View file
Expand Up @@ -12,7 +12,7 @@
case IWL_LED_DEFAULT:
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -191,7 +191,9 @@ void iwl_leds_init(struct iwl_priv *priv
@@ -184,7 +184,9 @@ void iwl_leds_init(struct iwl_priv *priv
wiphy_name(priv->hw->wiphy));
priv->led.brightness_set = iwl_led_brightness_set;
priv->led.blink_set = iwl_led_blink_set;
Expand Down
6 changes: 3 additions & 3 deletions patches/39-remove_blink_set.patch
View file
Expand Up @@ -28,23 +28,23 @@
#endif
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -170,6 +170,7 @@ static void iwl_led_brightness_set(struc
@@ -163,6 +163,7 @@ static void iwl_led_brightness_set(struc
iwl_led_cmd(priv, on, 0);
}

+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25))
static int iwl_led_blink_set(struct led_classdev *led_cdev,
unsigned long *delay_on,
unsigned long *delay_off)
@@ -178,6 +179,7 @@ static int iwl_led_blink_set(struct led_
@@ -171,6 +172,7 @@ static int iwl_led_blink_set(struct led_

return iwl_led_cmd(priv, *delay_on, *delay_off);
}
+#endif

void iwl_leds_init(struct iwl_priv *priv)
{
@@ -190,7 +192,9 @@ void iwl_leds_init(struct iwl_priv *priv
@@ -183,7 +185,9 @@ void iwl_leds_init(struct iwl_priv *priv
priv->led.name = kasprintf(GFP_KERNEL, "%s-led",
wiphy_name(priv->hw->wiphy));
priv->led.brightness_set = iwl_led_brightness_set;
Expand Down
10 changes: 5 additions & 5 deletions patches/40-netdev-hw-features.patch
View file
Expand Up @@ -129,7 +129,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000
void atl1e_set_ethtool_ops(struct net_device *netdev)
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -1929,7 +1929,11 @@ void atl1e_down(struct atl1e_adapter *ad
@@ -1928,7 +1928,11 @@ void atl1e_down(struct atl1e_adapter *ad
* reschedule our watchdog timer */
set_bit(__AT_DOWN, &adapter->flags);

Expand All @@ -141,7 +141,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000

/* reset MAC to disable all RX/TX */
atl1e_reset_hw(&adapter->hw);
@@ -2221,10 +2225,17 @@ static int atl1e_init_netdev(struct net_
@@ -2220,10 +2224,17 @@ static int atl1e_init_netdev(struct net_
netdev->watchdog_timeo = AT_TX_WATCHDOG;
atl1e_set_ethtool_ops(netdev);

Expand Down Expand Up @@ -202,7 +202,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000
};
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -1415,8 +1415,12 @@ static int __devinit atl2_probe(struct p
@@ -1414,8 +1414,12 @@ static int __devinit atl2_probe(struct p

err = -EIO;

Expand All @@ -215,7 +215,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000

/* Init PHY as early as possible due to power saving issue */
atl2_phy_init(&adapter->hw);
@@ -1843,6 +1847,13 @@ static int atl2_set_settings(struct net_
@@ -1842,6 +1846,13 @@ static int atl2_set_settings(struct net_
return 0;
}

Expand All @@ -229,7 +229,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000
static u32 atl2_get_msglevel(struct net_device *netdev)
{
return 0;
@@ -2110,6 +2121,14 @@ static const struct ethtool_ops atl2_eth
@@ -2109,6 +2120,14 @@ static const struct ethtool_ops atl2_eth
.get_eeprom_len = atl2_get_eeprom_len,
.get_eeprom = atl2_get_eeprom,
.set_eeprom = atl2_set_eeprom,
Expand Down

0 comments on commit 3afe4bf

Please sign in to comment.