diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-20 20:43:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-20 20:43:29 -0400 |
commit | db6d8c7a4027b48d797b369a53f8470aaeed7063 (patch) | |
tree | e140c104a89abc2154e1f41a7db8ebecbb6fa0b4 /drivers/net/sunlance.c | |
parent | 3a533374283aea50eab3976d8a6d30532175f009 (diff) | |
parent | fb65a7c091529bfffb1262515252c0d0f6241c5c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (1232 commits)
iucv: Fix bad merging.
net_sched: Add size table for qdiscs
net_sched: Add accessor function for packet length for qdiscs
net_sched: Add qdisc_enqueue wrapper
highmem: Export totalhigh_pages.
ipv6 mcast: Omit redundant address family checks in ip6_mc_source().
net: Use standard structures for generic socket address structures.
ipv6 netns: Make several "global" sysctl variables namespace aware.
netns: Use net_eq() to compare net-namespaces for optimization.
ipv6: remove unused macros from net/ipv6.h
ipv6: remove unused parameter from ip6_ra_control
tcp: fix kernel panic with listening_get_next
tcp: Remove redundant checks when setting eff_sacks
tcp: options clean up
tcp: Fix MD5 signatures for non-linear skbs
sctp: Update sctp global memory limit allocations.
sctp: remove unnecessary byteshifting, calculate directly in big-endian
sctp: Allow only 1 listening socket with SO_REUSEADDR
sctp: Do not leak memory on multiple listen() calls
sctp: Support ipv6only AF_INET6 sockets.
...
Diffstat (limited to 'drivers/net/sunlance.c')
-rw-r--r-- | drivers/net/sunlance.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index 26ade68aeabf..4e994f87469e 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
@@ -915,15 +915,11 @@ static void build_fake_packet(struct lance_private *lp) | |||
915 | lp->tx_new = TX_NEXT(entry); | 915 | lp->tx_new = TX_NEXT(entry); |
916 | } | 916 | } |
917 | 917 | ||
918 | struct net_device *last_dev; | ||
919 | |||
920 | static int lance_open(struct net_device *dev) | 918 | static int lance_open(struct net_device *dev) |
921 | { | 919 | { |
922 | struct lance_private *lp = netdev_priv(dev); | 920 | struct lance_private *lp = netdev_priv(dev); |
923 | int status = 0; | 921 | int status = 0; |
924 | 922 | ||
925 | last_dev = dev; | ||
926 | |||
927 | STOP_LANCE(lp); | 923 | STOP_LANCE(lp); |
928 | 924 | ||
929 | if (request_irq(dev->irq, &lance_interrupt, IRQF_SHARED, | 925 | if (request_irq(dev->irq, &lance_interrupt, IRQF_SHARED, |