diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 00:04:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 00:04:44 -0400 |
commit | f8965467f366fd18f01feafb5db10512d7b4422c (patch) | |
tree | 3706a9cd779859271ca61b85c63a1bc3f82d626e /drivers/net/lp486e.c | |
parent | a26272e5200765691e67d6780e52b32498fdb659 (diff) | |
parent | 2ec8c6bb5d8f3a62a79f463525054bae1e3d4487 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
qlcnic: adding co maintainer
ixgbe: add support for active DA cables
ixgbe: dcb, do not tag tc_prio_control frames
ixgbe: fix ixgbe_tx_is_paused logic
ixgbe: always enable vlan strip/insert when DCB is enabled
ixgbe: remove some redundant code in setting FCoE FIP filter
ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
ixgbe: fix header len when unsplit packet overflows to data buffer
ipv6: Never schedule DAD timer on dead address
ipv6: Use POSTDAD state
ipv6: Use state_lock to protect ifa state
ipv6: Replace inet6_ifaddr->dead with state
cxgb4: notify upper drivers if the device is already up when they load
cxgb4: keep interrupts available when the ports are brought down
cxgb4: fix initial addition of MAC address
cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
cnic: Convert cnic_local_flags to atomic ops.
can: Fix SJA1000 command register writes on SMP systems
bridge: fix build for CONFIG_SYSFS disabled
ARCNET: Limit com20020 PCI ID matches for SOHARD cards
...
Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).
Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c
Diffstat (limited to 'drivers/net/lp486e.c')
-rw-r--r-- | drivers/net/lp486e.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c index 3e3cc04defd..3df046a58b1 100644 --- a/drivers/net/lp486e.c +++ b/drivers/net/lp486e.c | |||
@@ -875,8 +875,6 @@ static netdev_tx_t i596_start_xmit (struct sk_buff *skb, struct net_device *dev) | |||
875 | length = ETH_ZLEN; | 875 | length = ETH_ZLEN; |
876 | } | 876 | } |
877 | 877 | ||
878 | dev->trans_start = jiffies; | ||
879 | |||
880 | tx_cmd = kmalloc((sizeof (struct tx_cmd) + sizeof (struct i596_tbd)), GFP_ATOMIC); | 878 | tx_cmd = kmalloc((sizeof (struct tx_cmd) + sizeof (struct i596_tbd)), GFP_ATOMIC); |
881 | if (tx_cmd == NULL) { | 879 | if (tx_cmd == NULL) { |
882 | printk(KERN_WARNING "%s: i596_xmit Memory squeeze, dropping packet.\n", dev->name); | 880 | printk(KERN_WARNING "%s: i596_xmit Memory squeeze, dropping packet.\n", dev->name); |
@@ -1256,7 +1254,7 @@ static void set_multicast_list(struct net_device *dev) { | |||
1256 | dev->name, netdev_mc_count(dev)); | 1254 | dev->name, netdev_mc_count(dev)); |
1257 | 1255 | ||
1258 | if (!netdev_mc_empty(dev)) { | 1256 | if (!netdev_mc_empty(dev)) { |
1259 | struct dev_mc_list *dmi; | 1257 | struct netdev_hw_addr *ha; |
1260 | char *cp; | 1258 | char *cp; |
1261 | cmd = kmalloc(sizeof(struct i596_cmd) + 2 + | 1259 | cmd = kmalloc(sizeof(struct i596_cmd) + 2 + |
1262 | netdev_mc_count(dev) * 6, GFP_ATOMIC); | 1260 | netdev_mc_count(dev) * 6, GFP_ATOMIC); |
@@ -1267,8 +1265,8 @@ static void set_multicast_list(struct net_device *dev) { | |||
1267 | cmd->command = CmdMulticastList; | 1265 | cmd->command = CmdMulticastList; |
1268 | *((unsigned short *) (cmd + 1)) = netdev_mc_count(dev) * 6; | 1266 | *((unsigned short *) (cmd + 1)) = netdev_mc_count(dev) * 6; |
1269 | cp = ((char *)(cmd + 1))+2; | 1267 | cp = ((char *)(cmd + 1))+2; |
1270 | netdev_for_each_mc_addr(dmi, dev) { | 1268 | netdev_for_each_mc_addr(ha, dev) { |
1271 | memcpy(cp, dmi->dmi_addr, 6); | 1269 | memcpy(cp, ha->addr, 6); |
1272 | cp += 6; | 1270 | cp += 6; |
1273 | } | 1271 | } |
1274 | if (i596_debug & LOG_SRCDST) | 1272 | if (i596_debug & LOG_SRCDST) |