git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: trans_start cleanups
[pandora-kernel.git]
/
drivers
/
net
/
atlx
/
atl2.c
diff --git
a/drivers/net/atlx/atl2.c
b/drivers/net/atlx/atl2.c
index
7061d71
..
8da8738
100644
(file)
--- a/
drivers/net/atlx/atl2.c
+++ b/
drivers/net/atlx/atl2.c
@@
-39,6
+39,7
@@
#include <linux/pci_ids.h>
#include <linux/pm.h>
#include <linux/skbuff.h>
#include <linux/pci_ids.h>
#include <linux/pm.h>
#include <linux/skbuff.h>
+#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/string.h>
#include <linux/tcp.h>
#include <linux/spinlock.h>
#include <linux/string.h>
#include <linux/tcp.h>
@@
-135,7
+136,7
@@
static void atl2_set_multi(struct net_device *netdev)
{
struct atl2_adapter *adapter = netdev_priv(netdev);
struct atl2_hw *hw = &adapter->hw;
{
struct atl2_adapter *adapter = netdev_priv(netdev);
struct atl2_hw *hw = &adapter->hw;
- struct
dev_mc_list *mc_ptr
;
+ struct
netdev_hw_addr *ha
;
u32 rctl;
u32 hash_value;
u32 rctl;
u32 hash_value;
@@
-157,8
+158,8
@@
static void atl2_set_multi(struct net_device *netdev)
ATL2_WRITE_REG_ARRAY(hw, REG_RX_HASH_TABLE, 1, 0);
/* comoute mc addresses' hash value ,and put it into hash table */
ATL2_WRITE_REG_ARRAY(hw, REG_RX_HASH_TABLE, 1, 0);
/* comoute mc addresses' hash value ,and put it into hash table */
- netdev_for_each_mc_addr(
mc_ptr
, netdev) {
- hash_value = atl2_hash_mc_addr(hw,
mc_ptr->dmi_
addr);
+ netdev_for_each_mc_addr(
ha
, netdev) {
+ hash_value = atl2_hash_mc_addr(hw,
ha->
addr);
atl2_hash_set(hw, hash_value);
}
}
atl2_hash_set(hw, hash_value);
}
}
@@
-421,7
+422,6
@@
static void atl2_intr_rx(struct atl2_adapter *adapter)
netdev->stats.rx_dropped++;
break;
}
netdev->stats.rx_dropped++;
break;
}
- skb->dev = netdev;
memcpy(skb->data, rxd->packet, rx_size);
skb_put(skb, rx_size);
skb->protocol = eth_type_trans(skb, netdev);
memcpy(skb->data, rxd->packet, rx_size);
skb_put(skb, rx_size);
skb->protocol = eth_type_trans(skb, netdev);
@@
-892,7
+892,6
@@
static netdev_tx_t atl2_xmit_frame(struct sk_buff *skb,
(adapter->txd_write_ptr >> 2));
mmiowb();
(adapter->txd_write_ptr >> 2));
mmiowb();
- netdev->trans_start = jiffies;
dev_kfree_skb_any(skb);
return NETDEV_TX_OK;
}
dev_kfree_skb_any(skb);
return NETDEV_TX_OK;
}