diff options
| author | Luis R. Rodriguez <mcgrof@frijolero.org> | 2012-05-06 20:35:11 -0700 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@frijolero.org> | 2012-05-06 20:35:11 -0700 |
| commit | cd3952d4c19aa05672edce9cf63d506fbf18b45e (patch) | |
| tree | 063907dffbcc8651be99d393fb3325e3f28c38ff /patches/40-netdev-hw-features.patch | |
| parent | ab0d1f0ed7a28866f2fbe2eca7c83843ffeace96 (diff) | |
compat-wireless: synch with next-20120504
Happy cinco de Mayo.
Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
Diffstat (limited to 'patches/40-netdev-hw-features.patch')
| -rw-r--r-- | patches/40-netdev-hw-features.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/patches/40-netdev-hw-features.patch b/patches/40-netdev-hw-features.patch index 40df3885..36bc09a8 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 -@@ -476,6 +476,7 @@ static void atl1c_set_rxbufsize(struct a +@@ -493,6 +493,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) { -@@ -504,6 +505,7 @@ static int atl1c_set_features(struct net +@@ -521,6 +522,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 -@@ -536,8 +538,19 @@ static int atl1c_change_mtu(struct net_d +@@ -553,8 +555,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); @@ -83,8 +83,8 @@ Date: Thu Apr 7 07:32:18 2011 +0000 +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ atl1c_up(adapter); clear_bit(__AT_RESETTING, &adapter->flags); - if (adapter->hw.ctrl_flags & ATL1C_FPGA_VERSION) { -@@ -2334,8 +2347,10 @@ static const struct net_device_ops atl1c + } +@@ -2407,8 +2420,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, -@@ -2354,6 +2369,7 @@ static int atl1c_init_netdev(struct net_ +@@ -2427,6 +2442,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 | -@@ -2361,6 +2377,14 @@ static int atl1c_init_netdev(struct net_ +@@ -2434,6 +2450,14 @@ static int atl1c_init_netdev(struct net_ NETIF_F_TSO6; netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_TX; |