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
462 IFLA_GENEVE_PORT, /* destination port */462 IFLA_GENEVE_PORT, /* destination port */
463 IFLA_GENEVE_COLLECT_METADATA,463 IFLA_GENEVE_COLLECT_METADATA,
464 IFLA_GENEVE_REMOTE6,464 IFLA_GENEVE_REMOTE6,
465 IFLA_GENEVE_UDP_CSUM,
466 IFLA_GENEVE_UDP_ZERO_CSUM6_TX,
467 IFLA_GENEVE_UDP_ZERO_CSUM6_RX,
465 __IFLA_GENEVE_MAX468 __IFLA_GENEVE_MAX
466};469};
467#define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)470#define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
include/uapi/linux/mroute.h+17−42
@@ -4,15 +4,13 @@ · 3 unmodified lines
4#include <linux/sockios.h>4#include <linux/sockios.h>
5#include <linux/types.h>5#include <linux/types.h>
6 6
7/*7/* Based on the MROUTING 3.5 defines primarily to keep
8 * Based on the MROUTING 3.5 defines primarily to keep8 * source compatibility with BSD.
9 * source compatibility with BSD.
10 *9 *
11 * See the mrouted code for the original history.10 * 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)
15 *11 *
12 * Protocol Independent Multicast (PIM) data structures included
13 * Carlos Picoto (cap@di.fc.ul.pt)
16 */14 */
17 15
18#define MRT_BASE 20016#define MRT_BASE 200
@@ -34,15 +32,13 @@ · 15 unmodified lines
34#define SIOCGETSGCNT (SIOCPROTOPRIVATE+1)32#define SIOCGETSGCNT (SIOCPROTOPRIVATE+1)
35#define SIOCGETRPF (SIOCPROTOPRIVATE+2)33#define SIOCGETRPF (SIOCPROTOPRIVATE+2)
36 34
37#define MAXVIFS 32 35#define MAXVIFS 32
38typedef unsigned long vifbitmap_t; /* User mode code depends on this lot */36typedef unsigned long vifbitmap_t; /* User mode code depends on this lot */
39typedef unsigned short vifi_t;37typedef unsigned short vifi_t;
40#define ALL_VIFS ((vifi_t)(-1))38#define ALL_VIFS ((vifi_t)(-1))
41 39
42/*40/* Same idea as select */
43 * Same idea as select41
44 */
45
46#define VIFM_SET(n,m) ((m)|=(1<<(n)))42#define VIFM_SET(n,m) ((m)|=(1<<(n)))
47#define VIFM_CLR(n,m) ((m)&=~(1<<(n)))43#define VIFM_CLR(n,m) ((m)&=~(1<<(n)))
48#define VIFM_ISSET(n,m) ((m)&(1<<(n)))44#define VIFM_ISSET(n,m) ((m)&(1<<(n)))
@@ -50,11 +46,9 @@ typedef unsigned short vifi_t; · 1 unmodified line
50#define VIFM_COPY(mfrom,mto) ((mto)=(mfrom))46#define VIFM_COPY(mfrom,mto) ((mto)=(mfrom))
51#define VIFM_SAME(m1,m2) ((m1)==(m2))47#define VIFM_SAME(m1,m2) ((m1)==(m2))
52 48
53/*49/* Passed by mrouted for an MRT_ADD_VIF - again we use the
54 * Passed by mrouted for an MRT_ADD_VIF - again we use the50 * mrouted 3.6 structures for compatibility
55 * mrouted 3.6 structures for compatibility
56 */51 */
57
58struct vifctl {52struct vifctl {
59 vifi_t vifc_vifi; /* Index of VIF */53 vifi_t vifc_vifi; /* Index of VIF */
60 unsigned char vifc_flags; /* VIFF_ flags */54 unsigned char vifc_flags; /* VIFF_ flags */
@@ -73,10 +67,7 @@ struct vifctl { · 12 unmodified lines
73#define VIFF_USE_IFINDEX 0x8 /* use vifc_lcl_ifindex instead of67#define VIFF_USE_IFINDEX 0x8 /* use vifc_lcl_ifindex instead of
74 vifc_lcl_addr to find an interface */68 vifc_lcl_addr to find an interface */
75 69
76/*70/* Cache manipulation structures for mrouted and PIMd */
77 * Cache manipulation structures for mrouted and PIMd
78 */
79
80struct mfcctl {71struct mfcctl {
81 struct in_addr mfcc_origin; /* Origin of mcast */72 struct in_addr mfcc_origin; /* Origin of mcast */
82 struct in_addr mfcc_mcastgrp; /* Group in question */73 struct in_addr mfcc_mcastgrp; /* Group in question */
@@ -88,10 +79,7 @@ struct mfcctl { · 5 unmodified lines
88 int mfcc_expire;79 int mfcc_expire;
89};80};
90 81
91/* 82/* Group count retrieval for mrouted */
92 * Group count retrieval for mrouted
93 */
94
95struct sioc_sg_req {83struct sioc_sg_req {
96 struct in_addr src;84 struct in_addr src;
97 struct in_addr grp;85 struct in_addr grp;
@@ -100,10 +88,7 @@ struct sioc_sg_req { · 2 unmodified lines
100 unsigned long wrong_if;88 unsigned long wrong_if;
101};89};
102 90
103/*91/* To get vif packet counts */
104 * To get vif packet counts
105 */
106
107struct sioc_vif_req {92struct sioc_vif_req {
108 vifi_t vifi; /* Which iface */93 vifi_t vifi; /* Which iface */
109 unsigned long icount; /* In packets */94 unsigned long icount; /* In packets */
@@ -112,11 +97,9 @@ struct sioc_vif_req { · 2 unmodified lines
112 unsigned long obytes; /* Out bytes */97 unsigned long obytes; /* Out bytes */
113};98};
114 99
115/*100/* This is the format the mroute daemon expects to see IGMP control
116 * This is the format the mroute daemon expects to see IGMP control101 * data. Magically happens to be like an IP packet as per the original
117 * data. Magically happens to be like an IP packet as per the original
118 */102 */
119
120struct igmpmsg {103struct igmpmsg {
121 __u32 unused1,unused2;104 __u32 unused1,unused2;
122 unsigned char im_msgtype; /* What is this */105 unsigned char im_msgtype; /* What is this */
@@ -126,21 +109,13 @@ struct igmpmsg { · 3 unmodified lines
126 struct in_addr im_src,im_dst;109 struct in_addr im_src,im_dst;
127};110};
128 111
129/*112/* That's all usermode folks */
130 * That's all usermode folks
131 */
132
133
134 113
135#define MFC_ASSERT_THRESH (3*HZ) /* Maximal freq. of asserts */114#define MFC_ASSERT_THRESH (3*HZ) /* Maximal freq. of asserts */
136 115
137/*116/* Pseudo messages used by mrouted */
138 * Pseudo messages used by mrouted
139 */
140
141#define IGMPMSG_NOCACHE 1 /* Kern cache fill request to mrouted */117#define IGMPMSG_NOCACHE 1 /* Kern cache fill request to mrouted */
142#define IGMPMSG_WRONGVIF 2 /* For PIM assert processing (unused) */118#define IGMPMSG_WRONGVIF 2 /* For PIM assert processing (unused) */
143#define IGMPMSG_WHOLEPKT 3 /* For PIM Register processing */119#define IGMPMSG_WHOLEPKT 3 /* For PIM Register processing */
144 120
145
146#endif /* _UAPI__LINUX_MROUTE_H */121#endif /* _UAPI__LINUX_MROUTE_H */
include/uapi/linux/nfs.h+0−11
@@ -33,17 +33,6 @@ · 32 unmodified lines
33 33
34#define NFS_PIPE_DIRNAME "nfs"34#define NFS_PIPE_DIRNAME "nfs"
35 35
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
41struct nfs_ioctl_clone_range_args {
42 __s64 src_fd;
43 __u64 src_off, count;
44 __u64 dst_off;
45};
46
47/*36/*
48 * NFS stats. The good thing with these values is that NFSv3 errors are37 * NFS stats. The good thing with these values is that NFSv3 errors are
49 * a superset of NFSv2 errors (with the exception of NFSERR_WFLUSH which38 * 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
820 * as an event to indicate changes for devices with wiphy-specific regdom820 * as an event to indicate changes for devices with wiphy-specific regdom
821 * management.821 * management.
822 *822 *
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 *
823 * @NL80211_CMD_MAX: highest used command number827 * @NL80211_CMD_MAX: highest used command number
824 * @__NL80211_CMD_AFTER_LAST: internal use828 * @__NL80211_CMD_AFTER_LAST: internal use
825 */829 */
@@ -1006,6 +1010,8 @@ enum nl80211_commands { · 180 unmodified lines
1006 1010
1007 NL80211_CMD_WIPHY_REG_CHANGE,1011 NL80211_CMD_WIPHY_REG_CHANGE,
1008 1012
1013 NL80211_CMD_ABORT_SCAN,
1014
1009 /* add new commands above here */1015 /* add new commands above here */
1010 1016
1011 /* used to define NL80211_CMD_MAX below */1017 /* used to define NL80211_CMD_MAX below */
@@ -1764,8 +1770,9 @@ enum nl80211_commands { · 752 unmodified lines
1764 * over all channels.1770 * over all channels.
1765 *1771 *
1766 * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before the first cycle of a1772 * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before the first cycle of a
1767 * scheduled scan (or a WoWLAN net-detect scan) is started, u321773 * scheduled scan is started. Or the delay before a WoWLAN
1768 * in seconds.1774 * net-detect scan is started, counting from the moment the
1775 * system is suspended. This value is a u32, in seconds.
1769 1776
1770 * @NL80211_ATTR_REG_INDOOR: flag attribute, if set indicates that the device1777 * @NL80211_ATTR_REG_INDOOR: flag attribute, if set indicates that the device
1771 * is operating in an indoor environment.1778 * 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