diff options
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index d84dc8d4c916..65bcaa789043 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -484,7 +484,7 @@ static void reg_vif_setup(struct net_device *dev) | |||
484 | dev->type = ARPHRD_PIMREG; | 484 | dev->type = ARPHRD_PIMREG; |
485 | dev->mtu = ETH_DATA_LEN - sizeof(struct iphdr) - 8; | 485 | dev->mtu = ETH_DATA_LEN - sizeof(struct iphdr) - 8; |
486 | dev->flags = IFF_NOARP; | 486 | dev->flags = IFF_NOARP; |
487 | dev->netdev_ops = ®_vif_netdev_ops, | 487 | dev->netdev_ops = ®_vif_netdev_ops; |
488 | dev->destructor = free_netdev; | 488 | dev->destructor = free_netdev; |
489 | dev->features |= NETIF_F_NETNS_LOCAL; | 489 | dev->features |= NETIF_F_NETNS_LOCAL; |
490 | } | 490 | } |
@@ -1663,7 +1663,7 @@ static void ip_encap(struct sk_buff *skb, __be32 saddr, __be32 daddr) | |||
1663 | iph->protocol = IPPROTO_IPIP; | 1663 | iph->protocol = IPPROTO_IPIP; |
1664 | iph->ihl = 5; | 1664 | iph->ihl = 5; |
1665 | iph->tot_len = htons(skb->len); | 1665 | iph->tot_len = htons(skb->len); |
1666 | ip_select_ident(skb, skb_dst(skb), NULL); | 1666 | ip_select_ident(skb, NULL); |
1667 | ip_send_check(iph); | 1667 | ip_send_check(iph); |
1668 | 1668 | ||
1669 | memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); | 1669 | memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); |