diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-30 15:54:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-30 15:54:35 -0700 |
commit | 7c30b0653f1bcaf04f8abf24cad5c1e642a3da47 (patch) | |
tree | bf62b79a6edb86ff17ef5eb8cbfa04c9c0783ba5 /drivers | |
parent | 7288026b8671061aff7663b1766037b3f2573627 (diff) | |
parent | ee1377c3eef4238d89b2f99fa4d0bbbad3078b64 (diff) | |
download | op-kernel-dev-7c30b0653f1bcaf04f8abf24cad5c1e642a3da47.zip op-kernel-dev-7c30b0653f1bcaf04f8abf24cad5c1e642a3da47.tar.gz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[STRIP]: Fix neighbour table refcount leak.
[IPV6]: ipv6_add_addr should install dstentry earlier
[NETLINK]: Call panic if nl_table allocation fails
[TCP]: Two RFC3465 Appropriate Byte Count fixes.
[IPV6]: SNMPv2 "ipv6IfStatsInAddrErrors" counter error
[E100]: Add module option to ignore bad EEPROM checksums.
[SCTP]: Fix sctp_primitive_ABORT() call in sctp_close().
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/e100.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/strip.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 91ef5f2..ce850f1 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -173,8 +173,11 @@ MODULE_LICENSE("GPL"); MODULE_VERSION(DRV_VERSION); static int debug = 3; +static int eeprom_bad_csum_allow = 0; module_param(debug, int, 0); +module_param(eeprom_bad_csum_allow, int, 0); MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)"); +MODULE_PARM_DESC(eeprom_bad_csum_allow, "Allow bad eeprom checksums"); #define DPRINTK(nlevel, klevel, fmt, args...) \ (void)((NETIF_MSG_##nlevel & nic->msg_enable) && \ printk(KERN_##klevel PFX "%s: %s: " fmt, nic->netdev->name, \ @@ -756,7 +759,8 @@ static int e100_eeprom_load(struct nic *nic) checksum = le16_to_cpu(0xBABA - checksum); if(checksum != nic->eeprom[nic->eeprom_wc - 1]) { DPRINTK(PROBE, ERR, "EEPROM corrupted\n"); - return -EAGAIN; + if (!eeprom_bad_csum_allow) + return -EAGAIN; } return 0; diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c index fd31885..ccaf28e 100644 --- a/drivers/net/wireless/strip.c +++ b/drivers/net/wireless/strip.c @@ -467,6 +467,7 @@ static int arp_query(unsigned char *haddr, u32 paddr, struct net_device *dev) { struct neighbour *neighbor_entry; + int ret = 0; neighbor_entry = neigh_lookup(&arp_tbl, &paddr, dev); @@ -474,10 +475,11 @@ static int arp_query(unsigned char *haddr, u32 paddr, neighbor_entry->used = jiffies; if (neighbor_entry->nud_state & NUD_VALID) { memcpy(haddr, neighbor_entry->ha, dev->addr_len); - return 1; + ret = 1; } + neigh_release(neighbor_entry); } - return 0; + return ret; } static void DumpData(char *msg, struct strip *strip_info, __u8 * ptr, |