net driver fixes
Subsystems (2)
PATCH 1/1 net driver fixes
Please pull from 'upstream-fixes' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
to receive the following updates:
drivers/net/8139cp.c | 37 +++++++++++--------- drivers/net/sky2.c | 77 ------------------------------------------- drivers/net/sky2.h | 1 drivers/net/via-velocity.c | 3 + net/ieee80211/ieee80211_rx.c | 16 ++------ 5 files changed, 29 insertions(+), 105 deletions(-)
Francois Romieu:
via-velocity: fix memory corruption when changing the mtu 8139cp: fix broken suspend/resume
Pete Zaitcev:
ieee80211_rx.c: is_beacon
Stephen Hemminger:
sky2: remove MSI support
drivers/net/8139cp.c +21 -16
@@ -1118,13 +1118,18 @@ err_out:return -ENOMEM ; } +static void cp_init_rings_index (struct cp_private *cp) +{ + cp->rx_tail =0 ; + cp->tx_head = cp->tx_tail =0 ; +} +static int cp_init_rings (struct cp_private *cp) {memset (cp->tx_ring,0 ,sizeof (struct cp_desc ) *CP_TX_RING_SIZE ); cp->tx_ring[CP_TX_RING_SIZE -1 ].opts1 =cpu_to_le32 (RingEnd); - cp->rx_tail =0 ; - cp->tx_head = cp->tx_tail =0 ; +cp_init_rings_index (cp);return cp_refill_rx (cp); }
@@ -1886,30 +1891,30 @@ static int cp_suspend (struct pci_dev *pspin_unlock_irqrestore (&cp->lock, flags); -if (cp->pdev && cp->wol_enabled) { -pci_save_state (cp->pdev); -cp_set_d3_state (cp); - } +pci_save_state (pdev); +pci_enable_wake (pdev,pci_choose_state (pdev, state), cp->wol_enabled); +pci_set_power_state (pdev,pci_choose_state (pdev, state));return 0 ; }static int cp_resume (struct pci_dev *pdev) { -struct net_device *dev; -struct cp_private *cp; +struct net_device *dev =pci_get_drvdata (pdev); +struct cp_private *cp =netdev_priv (dev);unsigned long flags; - dev =pci_get_drvdata (pdev); - cp =netdev_priv (dev); +if (!netif_running (dev)) +return 0 ;netif_device_attach (dev); - -if (cp->pdev && cp->wol_enabled) { -pci_set_power_state (cp->pdev,PCI_D0 ); -pci_restore_state (cp->pdev); - } - + +pci_set_power_state (pdev,PCI_D0 ); +pci_restore_state (pdev); +pci_enable_wake (pdev,PCI_D0 ,0 ); + +/* FIXME: sh*t may happen if the Rx ring buffer is depleted */ +cp_init_rings_index (cp);cp_init_hw (cp);netif_start_queue (dev);
drivers/net/sky2.c +0 -77
107 lines not on this page · raw message
drivers/net/sky2.h +0 -1
@@ -1881,7 +1881,6 @@ struct sky2_hw {u32 intr_mask;int pm_cap; -int msi;u8 chip_id;u8 chip_rev;u8 copper;
drivers/net/via-velocity.c +3 -0
@@ -1106,6 +1106,9 @@ static void velocity_free_rd_ring(structfor (i =0 ; i < vptr->options.numrx; i++) {struct velocity_rd_info *rd_info = &(vptr->rd_info[i]); +struct rx_desc *rd = vptr->rd_ring + i; + +memset (rd,0 ,sizeof (*rd));if (!rd_info->skb)continue ;
net/ieee80211/ieee80211_rx.c +5 -11
@@ -1301,7 +1301,7 @@ static void update_network(struct ieee80/* dst->last_associate is not overwritten */ } -static inline int is_beacon (int fc) +static inline int is_beacon (__le16 fc) {return (WLAN_FC_GET_STYPE (le16_to_cpu (fc)) ==IEEE80211_STYPE_BEACON ); }
@@ -1348,9 +1348,7 @@ static void ieee80211_process_probe_respescape_essid (info_element->data, info_element->len),MAC_ARG (beacon->header.addr3), -is_beacon (le16_to_cpu - (beacon->header. - frame_ctl)) ? +is_beacon (beacon->header.frame_ctl) ? "BEACON" : "PROBE RESPONSE");return ; }
@@ -1400,9 +1398,7 @@ static void ieee80211_process_probe_respescape_essid (network.ssid, network.ssid_len),MAC_ARG (network.bssid), -is_beacon (le16_to_cpu - (beacon->header. - frame_ctl)) ? +is_beacon (beacon->header.frame_ctl) ? "BEACON" : "PROBE RESPONSE");#endif memcpy (target, &network,sizeof (*target));
@@ -1412,16 +1408,14 @@ static void ieee80211_process_probe_respescape_essid (target->ssid, target->ssid_len),MAC_ARG (target->bssid), -is_beacon (le16_to_cpu - (beacon->header. - frame_ctl)) ? +is_beacon (beacon->header.frame_ctl) ? "BEACON" : "PROBE RESPONSE");update_network (target, &network); }spin_unlock_irqrestore (&ieee->lock, flags); -if (is_beacon (le16_to_cpu (beacon->header.frame_ctl))) { +if (is_beacon (beacon->header.frame_ctl)) {if (ieee->handle_beacon !=NULL ) ieee->handle_beacon (dev, beacon, &network); }else {