git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: skb->dst accessors
[pandora-kernel.git]
/
net
/
ipv6
/
ndisc.c
diff --git
a/net/ipv6/ndisc.c
b/net/ipv6/ndisc.c
index
9f061d1
..
9eb68e9
100644
(file)
--- a/
net/ipv6/ndisc.c
+++ b/
net/ipv6/ndisc.c
@@
-465,8
+465,8
@@
struct sk_buff *ndisc_build_skb(struct net_device *dev,
1, &err);
if (!skb) {
ND_PRINTK0(KERN_ERR
1, &err);
if (!skb) {
ND_PRINTK0(KERN_ERR
- "ICMPv6 ND: %s() failed to allocate an skb.\n",
- __func__);
+ "ICMPv6 ND: %s() failed to allocate an skb
, err=%d
.\n",
+ __func__
, err
);
return NULL;
}
return NULL;
}
@@
-530,10
+530,10
@@
void ndisc_send_skb(struct sk_buff *skb,
return;
}
return;
}
- skb
->dst = dst
;
+ skb
_dst_set(skb, dst)
;
idev = in6_dev_get(dst->dev);
idev = in6_dev_get(dst->dev);
- IP6_
INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS
);
+ IP6_
UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len
);
err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev,
dst_output);
err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev,
dst_output);
@@
-658,6
+658,7
@@
void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr,
&icmp6h, NULL,
send_sllao ? ND_OPT_SOURCE_LL_ADDR : 0);
}
&icmp6h, NULL,
send_sllao ? ND_OPT_SOURCE_LL_ADDR : 0);
}
+EXPORT_SYMBOL(ndisc_send_rs);
static void ndisc_error_report(struct neighbour *neigh, struct sk_buff *skb)
static void ndisc_error_report(struct neighbour *neigh, struct sk_buff *skb)
@@
-1561,8
+1562,8
@@
void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
1, &err);
if (buff == NULL) {
ND_PRINTK0(KERN_ERR
1, &err);
if (buff == NULL) {
ND_PRINTK0(KERN_ERR
- "ICMPv6 Redirect: %s() failed to allocate an skb.\n",
- __func__);
+ "ICMPv6 Redirect: %s() failed to allocate an skb
, err=%d
.\n",
+ __func__
, err
);
goto release;
}
goto release;
}
@@
-1611,9
+1612,9
@@
void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
len, IPPROTO_ICMPV6,
csum_partial(icmph, len, 0));
len, IPPROTO_ICMPV6,
csum_partial(icmph, len, 0));
-
buff->dst = dst
;
+
skb_dst_set(buff, dst)
;
idev = in6_dev_get(dst->dev);
idev = in6_dev_get(dst->dev);
- IP6_
INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS
);
+ IP6_
UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len
);
err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, buff, NULL, dst->dev,
dst_output);
if (!err) {
err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, buff, NULL, dst->dev,
dst_output);
if (!err) {