diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 17:36:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 17:36:46 -0700 |
| commit | 826509f8110049663799bc20f2b5b6170e2f78ca (patch) | |
| tree | 9d8823cf283592625b882125b4b13988f2934cc6 /include/net/rawv6.h | |
| parent | d992895ba2b27cf5adf1ba0ad6d27662adc54c5e (diff) | |
| parent | c530cfb1ce1e8f230744c3f3bd86771f50725053 (diff) | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
Diffstat (limited to 'include/net/rawv6.h')
| -rw-r--r-- | include/net/rawv6.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/rawv6.h b/include/net/rawv6.h index 23fd9a6a221a..14476a71725e 100644 --- a/include/net/rawv6.h +++ b/include/net/rawv6.h @@ -7,10 +7,11 @@ extern struct hlist_head raw_v6_htable[RAWV6_HTABLE_SIZE]; extern rwlock_t raw_v6_lock; -extern void ipv6_raw_deliver(struct sk_buff *skb, int nexthdr); +extern int ipv6_raw_deliver(struct sk_buff *skb, int nexthdr); extern struct sock *__raw_v6_lookup(struct sock *sk, unsigned short num, - struct in6_addr *loc_addr, struct in6_addr *rmt_addr); + struct in6_addr *loc_addr, struct in6_addr *rmt_addr, + int dif); extern int rawv6_rcv(struct sock *sk, struct sk_buff *skb); |