diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/net/arp.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/net/arp.h')
| -rw-r--r-- | include/net/arp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/arp.h b/include/net/arp.h index 716f43c5c98e..91f0568a04ef 100644 --- a/include/net/arp.h +++ b/include/net/arp.h | |||
| @@ -25,7 +25,6 @@ extern struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip, | |||
| 25 | const unsigned char *src_hw, | 25 | const unsigned char *src_hw, |
| 26 | const unsigned char *target_hw); | 26 | const unsigned char *target_hw); |
| 27 | extern void arp_xmit(struct sk_buff *skb); | 27 | extern void arp_xmit(struct sk_buff *skb); |
| 28 | 28 | int arp_invalidate(struct net_device *dev, __be32 ip); | |
| 29 | extern const struct neigh_ops arp_broken_ops; | ||
| 30 | 29 | ||
| 31 | #endif /* _ARP_H */ | 30 | #endif /* _ARP_H */ |