diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-25 01:01:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-25 01:01:33 -0400 |
| commit | 9eed28679282238210ad5e80bb91df30fec6d7db (patch) | |
| tree | e94e88cb57861c7820371fc8038f87c3631ee178 /net/ipv4/ipconfig.c | |
| parent | 2099c99e3b24f86b131566aa9854249189ae9ea2 (diff) | |
| parent | 0e64e94e477f8ed04e9295b11a5898d443c28a47 (diff) | |
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:
[DCCP]: Update documentation references.
[ATM] horizon: read_bia() needs to be __devinit
[NETFILTER]: Fix ip6_tables extension header bypass bug
[NETFILTER]: Fix ip6_tables protocol bypass bug
[XFRM]: Fix xfrm_state accounting
[IPV4] ipconfig: fix RARP ic_servaddr breakage
Diffstat (limited to 'net/ipv4/ipconfig.c')
| -rw-r--r-- | net/ipv4/ipconfig.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index f8ce84759159..955a07abb91d 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
| @@ -420,7 +420,7 @@ ic_rarp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt | |||
| 420 | { | 420 | { |
| 421 | struct arphdr *rarp; | 421 | struct arphdr *rarp; |
| 422 | unsigned char *rarp_ptr; | 422 | unsigned char *rarp_ptr; |
| 423 | unsigned long sip, tip; | 423 | u32 sip, tip; |
| 424 | unsigned char *sha, *tha; /* s for "source", t for "target" */ | 424 | unsigned char *sha, *tha; /* s for "source", t for "target" */ |
| 425 | struct ic_device *d; | 425 | struct ic_device *d; |
| 426 | 426 | ||