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
Merge branches 'msm-fixes' and 'msm-video' of git://codeaurora.org/quic/kernel/dwalke...
[pandora-kernel.git]
/
drivers
/
net
/
igb
/
igb_main.c
diff --git
a/drivers/net/igb/igb_main.c
b/drivers/net/igb/igb_main.c
index
14db09e
..
892d196
100644
(file)
--- a/
drivers/net/igb/igb_main.c
+++ b/
drivers/net/igb/igb_main.c
@@
-4107,7
+4107,6
@@
static inline int igb_maybe_stop_tx(struct igb_ring *tx_ring, int size)
netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *skb,
struct igb_ring *tx_ring)
{
- struct igb_adapter *adapter = netdev_priv(tx_ring->netdev);
int tso = 0, count;
u32 tx_flags = 0;
u16 first;