net driver fixes
Subsystems (3)
PATCH 1/1 net driver fixes
Please pull from 'upstream-fixes' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
to obtain the following fixes:
drivers/net/bonding/bond_main.c | 3 drivers/net/r8169.c | 4 drivers/net/skge.c | 194 ++++++++++++++++++---------------------- drivers/net/skge.h | 2 4 files changed, 97 insertions(+), 106 deletions(-)
[email protected]:
bonding: Fix link monitor capability check (was skge: set mac address oops with bonding)
Stephen Hemminger:
skge: expand ethtool debug register dump
skge: check length from PHY
Tommy Christensen:
r8169: call proper VLAN receive function
drivers/net/bonding/bond_main.c +2 -1
@@ -1653,7 +1653,8 @@ static int bond_enslave(struct net_devicint old_features = bond_dev->features;int res =0 ; -if (slave_dev->do_ioctl ==NULL ) { +if (!bond->params.use_carrier && slave_dev->ethtool_ops ==NULL && + slave_dev->do_ioctl ==NULL ) { printk(KERN_WARNING DRV_NAME": Warning : no link monitoring support for %s\n" , slave_dev->name);
drivers/net/r8169.c +2 -2
@@ -100,11 +100,11 @@ VERSION 2.2LK <2005/01/25>#ifdef CONFIG_R8169_NAPI #define rtl8169_rx_skb netif_receive_skb -#define rtl8169_rx_hwaccel_skb vlan_hwaccel_rx +#define rtl8169_rx_hwaccel_skb vlan_hwaccel_receive_skb#define rtl8169_rx_quota (count, quota) min(count, quota)#else #define rtl8169_rx_skb netif_rx -#define rtl8169_rx_hwaccel_skb vlan_hwaccel_receive_skb +#define rtl8169_rx_hwaccel_skb vlan_hwaccel_rx#define rtl8169_rx_quota (count, quota) count#endif
drivers/net/skge.c +91 -103
290 lines not on this page · raw message
drivers/net/skge.h +2 -0
@@ -953,6 +953,7 @@ enum {*/ enum {XMR_FS_LEN =0x3fff <<18 ,/* Bit 31..18: Rx Frame Length */ +XMR_FS_LEN_SHIFT =18 ,XMR_FS_2L_VLAN =1 <<17 ,/* Bit 17: tagged wh 2Lev VLAN ID*/ XMR_FS_1_VLAN =1 <<16 ,/* Bit 16: tagged wh 1ev VLAN ID*/ XMR_FS_BC =1 <<15 ,/* Bit 15: Broadcast Frame */
@@ -1868,6 +1869,7 @@ enum {/* Receive Frame Status Encoding */ enum {GMR_FS_LEN =0xffff <<16 ,/* Bit 31..16: Rx Frame Length */ +GMR_FS_LEN_SHIFT =16 ,GMR_FS_VLAN =1 <<13 ,/* Bit 13: VLAN Packet */ GMR_FS_JABBER =1 <<12 ,/* Bit 12: Jabber Packet */ GMR_FS_UN_SIZE =1 <<11 ,/* Bit 11: Undersize Packet */