projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[TCP] tcp_probe: improvements for net-2.6.22
[powerpc.git]
/
net
/
ipv4
/
arp.c
diff --git
a/net/ipv4/arp.c
b/net/ipv4/arp.c
index
0ffd2d2
..
7110779
100644
(file)
--- a/
net/ipv4/arp.c
+++ b/
net/ipv4/arp.c
@@
-78,7
+78,6
@@
#include <linux/types.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/string.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/capability.h>
#include <linux/socket.h>
#include <linux/sockios.h>
#include <linux/capability.h>
#include <linux/socket.h>
#include <linux/sockios.h>
@@
-343,13
+342,13
@@
static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)
switch (IN_DEV_ARP_ANNOUNCE(in_dev)) {
default:
case 0: /* By default announce any local IP */
switch (IN_DEV_ARP_ANNOUNCE(in_dev)) {
default:
case 0: /* By default announce any local IP */
- if (skb && inet_addr_type(
skb->nh.iph
->saddr) == RTN_LOCAL)
- saddr =
skb->nh.iph
->saddr;
+ if (skb && inet_addr_type(
ip_hdr(skb)
->saddr) == RTN_LOCAL)
+ saddr =
ip_hdr(skb)
->saddr;
break;
case 1: /* Restrict announcements of saddr in same subnet */
if (!skb)
break;
break;
case 1: /* Restrict announcements of saddr in same subnet */
if (!skb)
break;
- saddr =
skb->nh.iph
->saddr;
+ saddr =
ip_hdr(skb)
->saddr;
if (inet_addr_type(saddr) == RTN_LOCAL) {
/* saddr should be known to target */
if (inet_addr_onlink(in_dev, target, saddr))
if (inet_addr_type(saddr) == RTN_LOCAL) {
/* saddr should be known to target */
if (inet_addr_onlink(in_dev, target, saddr))
@@
-579,7
+578,7
@@
struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip,
return NULL;
skb_reserve(skb, LL_RESERVED_SPACE(dev));
return NULL;
skb_reserve(skb, LL_RESERVED_SPACE(dev));
- skb
->nh.raw = skb->data
;
+ skb
_reset_network_header(skb)
;
arp = (struct arphdr *) skb_put(skb,sizeof(struct arphdr) + 2*(dev->addr_len+4));
skb->dev = dev;
skb->protocol = htons(ETH_P_ARP);
arp = (struct arphdr *) skb_put(skb,sizeof(struct arphdr) + 2*(dev->addr_len+4));
skb->dev = dev;
skb->protocol = htons(ETH_P_ARP);
@@
-722,7
+721,7
@@
static int arp_process(struct sk_buff *skb)
if (in_dev == NULL)
goto out;
if (in_dev == NULL)
goto out;
- arp =
skb->nh.arph
;
+ arp =
arp_hdr(skb)
;
switch (dev_type) {
default:
switch (dev_type) {
default:
@@
-938,7
+937,7
@@
static int arp_rcv(struct sk_buff *skb, struct net_device *dev,
(2 * sizeof(u32)))))
goto freeskb;
(2 * sizeof(u32)))))
goto freeskb;
- arp =
skb->nh.arph
;
+ arp =
arp_hdr(skb)
;
if (arp->ar_hln != dev->addr_len ||
dev->flags & IFF_NOARP ||
skb->pkt_type == PACKET_OTHERHOST ||
if (arp->ar_hln != dev->addr_len ||
dev->flags & IFF_NOARP ||
skb->pkt_type == PACKET_OTHERHOST ||
@@
-1179,7
+1178,7
@@
int arp_ioctl(unsigned int cmd, void __user *arg)
goto out;
}
goto out;
}
- switch(cmd) {
+ switch
(cmd) {
case SIOCDARP:
err = arp_req_delete(&r, dev);
break;
case SIOCDARP:
err = arp_req_delete(&r, dev);
break;
@@
-1361,7
+1360,7
@@
static void *arp_seq_start(struct seq_file *seq, loff_t *pos)
/* ------------------------------------------------------------------------ */
/* ------------------------------------------------------------------------ */
-static struct seq_operations arp_seq_ops = {
+static
const
struct seq_operations arp_seq_ops = {
.start = arp_seq_start,
.next = neigh_seq_next,
.stop = neigh_seq_stop,
.start = arp_seq_start,
.next = neigh_seq_next,
.stop = neigh_seq_stop,