diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-08-16 08:56:44 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-08-16 08:56:44 -0400 |
| commit | 0f6a65da552ace4a1133130536f14d1c3cc33fe3 (patch) | |
| tree | 69759aa7f3565c62254c036caf3f69b9e9c50924 /include | |
| parent | 4253d31c229c5e985c37f080ad06848de162cc2a (diff) | |
| parent | 7d4d5a89e9a6226e0958fd1dd06e03f4916c8203 (diff) | |
Merge tag 'v3.0.88' into v3.0-rt
This is the 3.0.88 stable release
Conflicts:
kernel/hrtimer.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_pppox.h | 4 | ||||
| -rw-r--r-- | include/net/addrconf.h | 3 | ||||
| -rw-r--r-- | include/net/udp.h | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index 397921b09ef9..3c7d8badcc26 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h @@ -127,11 +127,11 @@ struct pppoe_tag { struct pppoe_hdr { #if defined(__LITTLE_ENDIAN_BITFIELD) - __u8 ver : 4; __u8 type : 4; + __u8 ver : 4; #elif defined(__BIG_ENDIAN_BITFIELD) - __u8 type : 4; __u8 ver : 4; + __u8 type : 4; #else #error "Please fix <asm/byteorder.h>" #endif diff --git a/include/net/addrconf.h b/include/net/addrconf.h index 582e4ae70753..561fd2a790cb 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h @@ -81,6 +81,9 @@ extern int ipv6_dev_get_saddr(struct net *net, const struct in6_addr *daddr, unsigned int srcprefs, struct in6_addr *saddr); +extern int __ipv6_get_lladdr(struct inet6_dev *idev, + struct in6_addr *addr, + unsigned char banned_flags); extern int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags); diff --git a/include/net/udp.h b/include/net/udp.h index 67ea6fcb3ec0..e723c9d87494 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -180,6 +180,7 @@ extern int udp_get_port(struct sock *sk, unsigned short snum, extern void udp_err(struct sk_buff *, u32); extern int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, size_t len); +extern int udp_push_pending_frames(struct sock *sk); extern void udp_flush_pending_frames(struct sock *sk); extern int udp_rcv(struct sk_buff *skb); extern int udp_ioctl(struct sock *sk, int cmd, unsigned long arg); |