* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits) e1000e: increase driver version number e1000e: alternate MAC address update e1000e: do not disable receiver on 82574/82583 e1000e: alternate MAC address does not work on device id 0x1060 PCnet: Fix section mismatch bnx2x: disable dcb on 578xx since not supported yet bnx2x: properly clean indirect addresses bnx2x: prevent race between undi_unload and load flows bnx2x: fix select_queue when FCoE is disabled bnx2x: init FCOE FP only once ipv4: some rt_iif -> rt_route_iif conversions net/bridge/netfilter/ebtables.c: use available error handling code net/netlabel/netlabel_kapi.c: add missing cleanup code net/irda: sh_sir: tidyup compile warning net/irda: sh_sir: add missing header net/irda: sh_irda: add missing header slcan: ldisc generated skbs are received in softirq context scm: Capture the full credentials of the scm sender tcp: initialize variable ecn_ok in syncookies path drivers/net/wireless/wl1251: add missing kfree ...
Showing the changes to include (3 of 46 files). Show all
Unified · Split
| @@ -29,7 +29,7 @@ · 28 unmodified lines | |||
| 29 | #define MAX_LINKS 32 | 29 | #define MAX_LINKS 32 |
| 30 | 30 | ||
| 31 | struct sockaddr_nl { | 31 | struct sockaddr_nl { |
| 32 | sa_family_t nl_family; /* AF_NETLINK */ | 32 | __kernel_sa_family_t nl_family; /* AF_NETLINK */ |
| 33 | unsigned short nl_pad; /* zero */ | 33 | unsigned short nl_pad; /* zero */ |
| 34 | __u32 nl_pid; /* port ID */ | 34 | __u32 nl_pid; /* port ID */ |
| 35 | __u32 nl_groups; /* multicast groups mask */ | 35 | __u32 nl_groups; /* multicast groups mask */ |
| @@ -8,8 +8,10 @@ · 7 unmodified lines | |||
| 8 | #define _K_SS_ALIGNSIZE (__alignof__ (struct sockaddr *)) | 8 | #define _K_SS_ALIGNSIZE (__alignof__ (struct sockaddr *)) |
| 9 | /* Implementation specific desired alignment */ | 9 | /* Implementation specific desired alignment */ |
| 10 | 10 | ||
| 11 | typedef unsigned short __kernel_sa_family_t; | ||
| 12 | |||
| 11 | struct __kernel_sockaddr_storage { | 13 | struct __kernel_sockaddr_storage { |
| 12 | unsigned short ss_family; /* address family */ | 14 | __kernel_sa_family_t ss_family; /* address family */ |
| 13 | /* Following field(s) are implementation specific */ | 15 | /* Following field(s) are implementation specific */ |
| 14 | char __data[_K_SS_MAXSIZE - sizeof(unsigned short)]; | 16 | char __data[_K_SS_MAXSIZE - sizeof(unsigned short)]; |
| 15 | /* space to achieve desired size, */ | 17 | /* space to achieve desired size, */ |
| @@ -35,7 +37,7 @@ struct seq_file; · 19 unmodified lines | |||
| 35 | extern void socket_seq_show(struct seq_file *seq); | 37 | extern void socket_seq_show(struct seq_file *seq); |
| 36 | #endif | 38 | #endif |
| 37 | 39 | ||
| 38 | typedef unsigned short sa_family_t; | 40 | typedef __kernel_sa_family_t sa_family_t; |
| 39 | 41 | ||
| 40 | /* | 42 | /* |
| 41 | * 1003.1g requires sa_family_t and that sa_data is char. | 43 | * 1003.1g requires sa_family_t and that sa_data is char. |
| @@ -238,7 +238,7 @@ static inline __u8 inet_sk_flowi_flags(const struct sock *sk) · 237 unmodified lines | |||
| 238 | { | 238 | { |
| 239 | __u8 flags = 0; | 239 | __u8 flags = 0; |
| 240 | 240 | ||
| 241 | if (inet_sk(sk)->transparent) | 241 | if (inet_sk(sk)->transparent || inet_sk(sk)->hdrincl) |
| 242 | flags |= FLOWI_FLAG_ANYSRC; | 242 | flags |= FLOWI_FLAG_ANYSRC; |
| 243 | if (sk->sk_protocol == IPPROTO_TCP) | 243 | if (sk->sk_protocol == IPPROTO_TCP) |
| 244 | flags |= FLOWI_FLAG_PRECOW_METRICS; | 244 | flags |= FLOWI_FLAG_PRECOW_METRICS; |