diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 11:46:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 11:46:28 -0700 |
| commit | 3a7029d822d3aef4502269dae5fe8fbb83672bc5 (patch) | |
| tree | 0d9f5152035cbeeb7ae4372dbb808d6cdcc6ae87 /drivers/net/wan/syncppp.c | |
| parent | 4ac08d36aa9c556556c7b150caee263c6d542645 (diff) | |
| parent | 48e5ecae691cfb50aa39036ba9fc193f5c24dbb3 (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:
amd8111e: Fix rx return code
pktgen: fix multiple queue warning
mac80211.h: fix kernel-doc excesses
p54: fix build warnings
ath5k: Reset key cache on interface up, thus fixing resume
mac80211: correct warnings in minstrel rate control algorithm
RFKILL: fix input layer initialisation
p54: fix misbehavings when firmware can't be found
dm9601: runtime mac address change support
via-velocity: use driver string instead of dev->name before register_netdev()
drivers/net/wan/syncppp: Fix unused-var warnings
mlx4: Setting the correct offset for default mac address
mlx4_en: remove duplicated #include
ibm_newemac: Fix typo in flow control config option
ehea: Detect 16GB hugepages for firmware restriction
dmfe: check pci_alloc_consistent errors
qeth: avoid skb_under_panic for malformatted inbound data
qeth: remove unnecessary support ckeck in sysfs route6
qeth: fix offset error in non prealloc header path
qeth: remove non-recover-thread checkings
Diffstat (limited to 'drivers/net/wan/syncppp.c')
| -rw-r--r-- | drivers/net/wan/syncppp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c index 327d58589e1..6e92f7b44b1 100644 --- a/drivers/net/wan/syncppp.c +++ b/drivers/net/wan/syncppp.c @@ -756,10 +756,11 @@ static void sppp_cisco_input (struct sppp *sp, struct sk_buff *skb) case CISCO_ADDR_REQ: /* Stolen from net/ipv4/devinet.c -- SIOCGIFADDR ioctl */ { - struct in_device *in_dev; - struct in_ifaddr *ifa; __be32 addr = 0, mask = htonl(~0U); /* FIXME: is the mask correct? */ #ifdef CONFIG_INET + struct in_device *in_dev; + struct in_ifaddr *ifa; + rcu_read_lock(); if ((in_dev = __in_dev_get_rcu(dev)) != NULL) { |