diff options
Diffstat (limited to 'net/ipv6/ndisc.c')
-rw-r--r-- | net/ipv6/ndisc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 01a0ffc7b402..69aacd18e066 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -324,7 +324,7 @@ static inline u8 *ndisc_opt_addr_data(struct nd_opt_hdr *p, | |||
324 | return lladdr + prepad; | 324 | return lladdr + prepad; |
325 | } | 325 | } |
326 | 326 | ||
327 | int ndisc_mc_map(struct in6_addr *addr, char *buf, struct net_device *dev, int dir) | 327 | int ndisc_mc_map(const struct in6_addr *addr, char *buf, struct net_device *dev, int dir) |
328 | { | 328 | { |
329 | switch (dev->type) { | 329 | switch (dev->type) { |
330 | case ARPHRD_ETHER: | 330 | case ARPHRD_ETHER: |
@@ -748,8 +748,8 @@ static int pndisc_is_router(const void *pkey, | |||
748 | static void ndisc_recv_ns(struct sk_buff *skb) | 748 | static void ndisc_recv_ns(struct sk_buff *skb) |
749 | { | 749 | { |
750 | struct nd_msg *msg = (struct nd_msg *)skb_transport_header(skb); | 750 | struct nd_msg *msg = (struct nd_msg *)skb_transport_header(skb); |
751 | struct in6_addr *saddr = &ipv6_hdr(skb)->saddr; | 751 | const struct in6_addr *saddr = &ipv6_hdr(skb)->saddr; |
752 | struct in6_addr *daddr = &ipv6_hdr(skb)->daddr; | 752 | const struct in6_addr *daddr = &ipv6_hdr(skb)->daddr; |
753 | u8 *lladdr = NULL; | 753 | u8 *lladdr = NULL; |
754 | u32 ndoptlen = skb->tail - (skb->transport_header + | 754 | u32 ndoptlen = skb->tail - (skb->transport_header + |
755 | offsetof(struct nd_msg, opt)); | 755 | offsetof(struct nd_msg, opt)); |
@@ -924,8 +924,8 @@ out: | |||
924 | static void ndisc_recv_na(struct sk_buff *skb) | 924 | static void ndisc_recv_na(struct sk_buff *skb) |
925 | { | 925 | { |
926 | struct nd_msg *msg = (struct nd_msg *)skb_transport_header(skb); | 926 | struct nd_msg *msg = (struct nd_msg *)skb_transport_header(skb); |
927 | struct in6_addr *saddr = &ipv6_hdr(skb)->saddr; | 927 | const struct in6_addr *saddr = &ipv6_hdr(skb)->saddr; |
928 | struct in6_addr *daddr = &ipv6_hdr(skb)->daddr; | 928 | const struct in6_addr *daddr = &ipv6_hdr(skb)->daddr; |
929 | u8 *lladdr = NULL; | 929 | u8 *lladdr = NULL; |
930 | u32 ndoptlen = skb->tail - (skb->transport_header + | 930 | u32 ndoptlen = skb->tail - (skb->transport_header + |
931 | offsetof(struct nd_msg, opt)); | 931 | offsetof(struct nd_msg, opt)); |
@@ -1038,7 +1038,7 @@ static void ndisc_recv_rs(struct sk_buff *skb) | |||
1038 | unsigned long ndoptlen = skb->len - sizeof(*rs_msg); | 1038 | unsigned long ndoptlen = skb->len - sizeof(*rs_msg); |
1039 | struct neighbour *neigh; | 1039 | struct neighbour *neigh; |
1040 | struct inet6_dev *idev; | 1040 | struct inet6_dev *idev; |
1041 | struct in6_addr *saddr = &ipv6_hdr(skb)->saddr; | 1041 | const struct in6_addr *saddr = &ipv6_hdr(skb)->saddr; |
1042 | struct ndisc_options ndopts; | 1042 | struct ndisc_options ndopts; |
1043 | u8 *lladdr = NULL; | 1043 | u8 *lladdr = NULL; |
1044 | 1044 | ||
@@ -1435,8 +1435,8 @@ static void ndisc_redirect_rcv(struct sk_buff *skb) | |||
1435 | { | 1435 | { |
1436 | struct inet6_dev *in6_dev; | 1436 | struct inet6_dev *in6_dev; |
1437 | struct icmp6hdr *icmph; | 1437 | struct icmp6hdr *icmph; |
1438 | struct in6_addr *dest; | 1438 | const struct in6_addr *dest; |
1439 | struct in6_addr *target; /* new first hop to destination */ | 1439 | const struct in6_addr *target; /* new first hop to destination */ |
1440 | struct neighbour *neigh; | 1440 | struct neighbour *neigh; |
1441 | int on_link = 0; | 1441 | int on_link = 0; |
1442 | struct ndisc_options ndopts; | 1442 | struct ndisc_options ndopts; |
@@ -1469,7 +1469,7 @@ static void ndisc_redirect_rcv(struct sk_buff *skb) | |||
1469 | } | 1469 | } |
1470 | 1470 | ||
1471 | icmph = icmp6_hdr(skb); | 1471 | icmph = icmp6_hdr(skb); |
1472 | target = (struct in6_addr *) (icmph + 1); | 1472 | target = (const struct in6_addr *) (icmph + 1); |
1473 | dest = target + 1; | 1473 | dest = target + 1; |
1474 | 1474 | ||
1475 | if (ipv6_addr_is_multicast(dest)) { | 1475 | if (ipv6_addr_is_multicast(dest)) { |