History

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

Pablo Neira Ayuso says: ==================== The following patchset contains fixes for recently applied Netfilter/IPVS updates to the net-next tree, most relevantly they are: * Fix sparse warnings introduced in the RCU conversion, from Julian Anastasov. * Fix wrong endianness in the size field of IPVS sync messages, from Simon Horman. * Fix missing if checking in nf_xfrm_me_harder, from Dan Carpenter. * Fix off by one access in the IPVS SCTP tracking code, again from Dan Carpenter. ====================

David S. Miller committed 13 years ago

Commit d3734b02 parents 204cd4f e7e6f6311 files · +64 −55Browse files

Showing the changes to include/uapi/linux (1 of 11 files). Show all

Unified · Split

include/uapi/linux/ip_vs.h+2−2
@@ -280,8 +280,8 @@ struct ip_vs_daemon_user { · 279 unmodified lines
280#define IPVS_GENL_VERSION 0x1280#define IPVS_GENL_VERSION 0x1
281 281
282struct ip_vs_flags {282struct ip_vs_flags {
283 __be32 flags;283 __u32 flags;
284 __be32 mask;284 __u32 mask;
285};285};
286 286
287/* Generic Netlink command attributes */287/* Generic Netlink command attributes */

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