|
@@ -67,9 +67,6 @@ static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff *
|
|
|
struct in6_addr *nexthop;
|
|
struct in6_addr *nexthop;
|
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
|
|
- skb->protocol = htons(ETH_P_IPV6);
|
|
|
|
|
- skb->dev = dev;
|
|
|
|
|
-
|
|
|
|
|
if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr)) {
|
|
if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr)) {
|
|
|
struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));
|
|
struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));
|
|
|
|
|
|
|
@@ -154,6 +151,9 @@ int ip6_output(struct net *net, struct sock *sk, struct sk_buff *skb)
|
|
|
struct net_device *dev = skb_dst(skb)->dev;
|
|
struct net_device *dev = skb_dst(skb)->dev;
|
|
|
struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));
|
|
struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));
|
|
|
|
|
|
|
|
|
|
+ skb->protocol = htons(ETH_P_IPV6);
|
|
|
|
|
+ skb->dev = dev;
|
|
|
|
|
+
|
|
|
if (unlikely(idev->cnf.disable_ipv6)) {
|
|
if (unlikely(idev->cnf.disable_ipv6)) {
|
|
|
IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);
|
|
IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);
|
|
|
kfree_skb(skb);
|
|
kfree_skb(skb);
|