GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-21 22:21:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	net/ipv4/fib_frontend.c
This commit is contained in:
David S. Miller 2010-12-26 22:37:05 -08:00
commit 17f7f4d9fc
1401 changed files with 22733 additions and 12093 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/net/flow.h
View file

@ -49,7 +49,6 @@ struct flowi {
__u8 proto;
__u8 flags;
#define FLOWI_FLAG_ANYSRC 0x01
#define FLOWI_FLAG_MATCH_ANY_IIF 0x02
union {
struct {
__be16 sport;