History

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Resolve conflict between commit 264640fc2c5f4f ("ipv6: distinguish frag queues by device for multicast and link-local packets") from the net tree and commit 029f7f3b8701c ("netfilter: ipv6: nf_defrag: avoid/free clone operations") from the nf-next tree. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Pablo Neira Ayuso committed 10 years ago

Commit a4ec8002 parents 19576c9 cb4396e1692 files · +37585 −18054Browse files

Showing the changes to include/uapi (4 of 1692 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/if_link.h +3 −0
  2. include/uapi/linux/mroute.h +17 −42
  3. include/uapi/linux/nfs.h +0 −11
  4. include/uapi/linux/nl80211.h +9 −2
include/uapi/linux/if_link.h+3−0
@@ -462,6 +462,9 @@ enum { · 461 unmodified lines
462462 IFLA_GENEVE_PORT, /* destination port */
463463 IFLA_GENEVE_COLLECT_METADATA,
464464 IFLA_GENEVE_REMOTE6,
465+ IFLA_GENEVE_UDP_CSUM,
466+ IFLA_GENEVE_UDP_ZERO_CSUM6_TX,
467+ IFLA_GENEVE_UDP_ZERO_CSUM6_RX,
465468 __IFLA_GENEVE_MAX
466469 };
467470 #define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
include/uapi/linux/mroute.h+17−42
@@ -4,15 +4,13 @@ · 3 unmodified lines
44 #include <linux/sockios.h>
55 #include <linux/types.h>
66
7−/*
8− * Based on the MROUTING 3.5 defines primarily to keep
9− * source compatibility with BSD.
7+/* Based on the MROUTING 3.5 defines primarily to keep
8+ * source compatibility with BSD.
109 *
11− * See the mrouted code for the original history.
12− *
13− * Protocol Independent Multicast (PIM) data structures included
14− * Carlos Picoto (cap@di.fc.ul.pt)
10+ * See the mrouted code for the original history.
1511 *
12+ * Protocol Independent Multicast (PIM) data structures included
13+ * Carlos Picoto (cap@di.fc.ul.pt)
1614 */
1715
1816 #define MRT_BASE 200
@@ -34,15 +32,13 @@ · 15 unmodified lines
3432 #define SIOCGETSGCNT (SIOCPROTOPRIVATE+1)
3533 #define SIOCGETRPF (SIOCPROTOPRIVATE+2)
3634
37−#define MAXVIFS 32
35+#define MAXVIFS 32
3836 typedef unsigned long vifbitmap_t; /* User mode code depends on this lot */
3937 typedef unsigned short vifi_t;
4038 #define ALL_VIFS ((vifi_t)(-1))
4139
42−/*
43− * Same idea as select
44− */
45−
40+/* Same idea as select */
41+
4642 #define VIFM_SET(n,m) ((m)|=(1<<(n)))
4743 #define VIFM_CLR(n,m) ((m)&=~(1<<(n)))
4844 #define VIFM_ISSET(n,m) ((m)&(1<<(n)))
@@ -50,11 +46,9 @@ typedef unsigned short vifi_t; · 1 unmodified line
5046 #define VIFM_COPY(mfrom,mto) ((mto)=(mfrom))
5147 #define VIFM_SAME(m1,m2) ((m1)==(m2))
5248
53−/*
54− * Passed by mrouted for an MRT_ADD_VIF - again we use the
55− * mrouted 3.6 structures for compatibility
49+/* Passed by mrouted for an MRT_ADD_VIF - again we use the
50+ * mrouted 3.6 structures for compatibility
5651 */
57−
5852 struct vifctl {
5953 vifi_t vifc_vifi; /* Index of VIF */
6054 unsigned char vifc_flags; /* VIFF_ flags */
@@ -73,10 +67,7 @@ struct vifctl { · 12 unmodified lines
7367 #define VIFF_USE_IFINDEX 0x8 /* use vifc_lcl_ifindex instead of
7468 vifc_lcl_addr to find an interface */
7569
76−/*
77− * Cache manipulation structures for mrouted and PIMd
78− */
79−
70+/* Cache manipulation structures for mrouted and PIMd */
8071 struct mfcctl {
8172 struct in_addr mfcc_origin; /* Origin of mcast */
8273 struct in_addr mfcc_mcastgrp; /* Group in question */
@@ -88,10 +79,7 @@ struct mfcctl { · 5 unmodified lines
8879 int mfcc_expire;
8980 };
9081
91−/*
92− * Group count retrieval for mrouted
93− */
94−
82+/* Group count retrieval for mrouted */
9583 struct sioc_sg_req {
9684 struct in_addr src;
9785 struct in_addr grp;
@@ -100,10 +88,7 @@ struct sioc_sg_req { · 2 unmodified lines
10088 unsigned long wrong_if;
10189 };
10290
103−/*
104− * To get vif packet counts
105− */
106−
91+/* To get vif packet counts */
10792 struct sioc_vif_req {
10893 vifi_t vifi; /* Which iface */
10994 unsigned long icount; /* In packets */
@@ -112,11 +97,9 @@ struct sioc_vif_req { · 2 unmodified lines
11297 unsigned long obytes; /* Out bytes */
11398 };
11499
115−/*
116− * This is the format the mroute daemon expects to see IGMP control
117− * data. Magically happens to be like an IP packet as per the original
100+/* This is the format the mroute daemon expects to see IGMP control
101+ * data. Magically happens to be like an IP packet as per the original
118102 */
119−
120103 struct igmpmsg {
121104 __u32 unused1,unused2;
122105 unsigned char im_msgtype; /* What is this */
@@ -126,21 +109,13 @@ struct igmpmsg { · 3 unmodified lines
126109 struct in_addr im_src,im_dst;
127110 };
128111
129−/*
130− * That's all usermode folks
131− */
132−
133−
112+/* That's all usermode folks */
134113
135114 #define MFC_ASSERT_THRESH (3*HZ) /* Maximal freq. of asserts */
136115
137−/*
138− * Pseudo messages used by mrouted
139− */
140−
116+/* Pseudo messages used by mrouted */
141117 #define IGMPMSG_NOCACHE 1 /* Kern cache fill request to mrouted */
142118 #define IGMPMSG_WRONGVIF 2 /* For PIM assert processing (unused) */
143119 #define IGMPMSG_WHOLEPKT 3 /* For PIM Register processing */
144120
145−
146121 #endif /* _UAPI__LINUX_MROUTE_H */
include/uapi/linux/nfs.h+0−11
@@ -33,17 +33,6 @@ · 32 unmodified lines
3333
3434 #define NFS_PIPE_DIRNAME "nfs"
3535
36−/* NFS ioctls */
37−/* Let's follow btrfs lead on CLONE to avoid messing userspace */
38−#define NFS_IOC_CLONE _IOW(0x94, 9, int)
39−#define NFS_IOC_CLONE_RANGE _IOW(0x94, 13, int)
40−
41−struct nfs_ioctl_clone_range_args {
42− __s64 src_fd;
43− __u64 src_off, count;
44− __u64 dst_off;
45−};
46−
4736 /*
4837 * NFS stats. The good thing with these values is that NFSv3 errors are
4938 * a superset of NFSv2 errors (with the exception of NFSERR_WFLUSH which
include/uapi/linux/nl80211.h+9−2
@@ -820,6 +820,10 @@ · 819 unmodified lines
820820 * as an event to indicate changes for devices with wiphy-specific regdom
821821 * management.
822822 *
823+ * @NL80211_CMD_ABORT_SCAN: Stop an ongoing scan. Returns -ENOENT if a scan is
824+ * not running. The driver indicates the status of the scan through
825+ * cfg80211_scan_done().
826+ *
823827 * @NL80211_CMD_MAX: highest used command number
824828 * @__NL80211_CMD_AFTER_LAST: internal use
825829 */
@@ -1006,6 +1010,8 @@ enum nl80211_commands { · 180 unmodified lines
10061010
10071011 NL80211_CMD_WIPHY_REG_CHANGE,
10081012
1013+ NL80211_CMD_ABORT_SCAN,
1014+
10091015 /* add new commands above here */
10101016
10111017 /* used to define NL80211_CMD_MAX below */
@@ -1764,8 +1770,9 @@ enum nl80211_commands { · 752 unmodified lines
17641770 * over all channels.
17651771 *
17661772 * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before the first cycle of a
1767− * scheduled scan (or a WoWLAN net-detect scan) is started, u32
1768− * in seconds.
1773+ * scheduled scan is started. Or the delay before a WoWLAN
1774+ * net-detect scan is started, counting from the moment the
1775+ * system is suspended. This value is a u32, in seconds.
17691776
17701777 * @NL80211_ATTR_REG_INDOOR: flag attribute, if set indicates that the device
17711778 * is operating in an indoor environment.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t