Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  netfilter: xt_connbytes: handle negation correctly
  net: relax rcvbuf limits
  rps: fix insufficient bounds checking in store_rps_dev_flow_table_cnt()
  net: introduce DST_NOPEER dst flag
  mqprio: Avoid panic if no options are provided
  bridge: provide a mtu() method for fake_dst_ops

...

This commit is contained in:

Linus Torvalds 2011-12-23 14:57:55 -08:00

parent ad1fca2003 6350323ad8

commit 155d4551bd

10 changed files with 26 additions and 20 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

include/net/dst.h

View file

4

include/net/sock.h

View file

8

net/bridge/br_netfilter.c

View file

7

net/core/net-sysfs.c

View file

6

net/core/sock.c

View file

4

net/ipv4/route.c

View file

2

net/ipv6/ip6_output.c

View file

6

net/netfilter/xt_connbytes.c

View file

6

net/packet/af_packet.c

View file

2

net/sched/sch_mqprio.c

View file