Conflicts: drivers/net/wireless/iwlwifi/pcie/trans.c include/linux/inetdevice.h The inetdevice.h conflict involves moving the IPV4_DEVCONF values into a UAPI header, overlapping additions of some new entries. The iwlwifi conflict is a context overlap.
Showing the changes to include/uapi/linux (1 of 119 files). Show all
Unified · Split
| @@ -133,4 +133,40 @@ struct ip_beet_phdr { · 132 unmodified lines | |||
| 133 | __u8 reserved; | 133 | __u8 reserved; |
| 134 | }; | 134 | }; |
| 135 | 135 | ||
| 136 | /* index values for the variables in ipv4_devconf */ | ||
| 137 | enum | ||
| 138 | { | ||
| 139 | IPV4_DEVCONF_FORWARDING=1, | ||
| 140 | IPV4_DEVCONF_MC_FORWARDING, | ||
| 141 | IPV4_DEVCONF_PROXY_ARP, | ||
| 142 | IPV4_DEVCONF_ACCEPT_REDIRECTS, | ||
| 143 | IPV4_DEVCONF_SECURE_REDIRECTS, | ||
| 144 | IPV4_DEVCONF_SEND_REDIRECTS, | ||
| 145 | IPV4_DEVCONF_SHARED_MEDIA, | ||
| 146 | IPV4_DEVCONF_RP_FILTER, | ||
| 147 | IPV4_DEVCONF_ACCEPT_SOURCE_ROUTE, | ||
| 148 | IPV4_DEVCONF_BOOTP_RELAY, | ||
| 149 | IPV4_DEVCONF_LOG_MARTIANS, | ||
| 150 | IPV4_DEVCONF_TAG, | ||
| 151 | IPV4_DEVCONF_ARPFILTER, | ||
| 152 | IPV4_DEVCONF_MEDIUM_ID, | ||
| 153 | IPV4_DEVCONF_NOXFRM, | ||
| 154 | IPV4_DEVCONF_NOPOLICY, | ||
| 155 | IPV4_DEVCONF_FORCE_IGMP_VERSION, | ||
| 156 | IPV4_DEVCONF_ARP_ANNOUNCE, | ||
| 157 | IPV4_DEVCONF_ARP_IGNORE, | ||
| 158 | IPV4_DEVCONF_PROMOTE_SECONDARIES, | ||
| 159 | IPV4_DEVCONF_ARP_ACCEPT, | ||
| 160 | IPV4_DEVCONF_ARP_NOTIFY, | ||
| 161 | IPV4_DEVCONF_ACCEPT_LOCAL, | ||
| 162 | IPV4_DEVCONF_SRC_VMARK, | ||
| 163 | IPV4_DEVCONF_PROXY_ARP_PVLAN, | ||
| 164 | IPV4_DEVCONF_ROUTE_LOCALNET, | ||
| 165 | IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL, | ||
| 166 | IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL, | ||
| 167 | __IPV4_DEVCONF_MAX | ||
| 168 | }; | ||
| 169 | |||
| 170 | #define IPV4_DEVCONF_MAX (__IPV4_DEVCONF_MAX - 1) | ||
| 171 | |||
| 136 | #endif /* _UAPI_LINUX_IP_H */ | 172 | #endif /* _UAPI_LINUX_IP_H */ |