linux-toradex.git/net/llc, branch v2.6.26-rc3 Linux kernel for Apalis and Colibri modules Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2008-04-03T05:35:23+00:00 David S. Miller davem@davemloft.net 2008-04-03T05:35:23+00:00 e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a Conflicts: drivers/net/s2io.c 
Conflicts:

	drivers/net/s2io.c
[LLC]: skb allocation size for responses 2008-04-01T04:02:47+00:00 Joonwoo Park joonwpark81@gmail.com 2008-04-01T04:02:47+00:00 f83f1768f833cb45bc93429fdc552252a4f55ac3 Allocate the skb for llc responses with the received packet size by using the size adjustable llc_frame_alloc. Don't allocate useless extra payload. Cleanup magic numbers. So, this fixes oops. Reported by Jim Westfall: kernel: skb_over_panic: text:c0541fc7 len:1000 put:997 head:c166ac00 data:c166ac2f tail:0xc166b017 end:0xc166ac80 dev:eth0 kernel: ------------[ cut here ]------------ kernel: kernel BUG at net/core/skbuff.c:95! Signed-off-by: Joonwoo Park <joonwpark81@gmail.com> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Allocate the skb for llc responses with the received packet size by
using the size adjustable llc_frame_alloc.
Don't allocate useless extra payload.
Cleanup magic numbers.

So, this fixes oops.
Reported by Jim Westfall:
kernel: skb_over_panic: text:c0541fc7 len:1000 put:997 head:c166ac00 data:c166ac2f tail:0xc166b017 end:0xc166ac80 dev:eth0
kernel: ------------[ cut here ]------------
kernel: kernel BUG at net/core/skbuff.c:95!

Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[LLC]: Kill llc_station_mac_sa symbol export. 2008-03-29T02:51:40+00:00 David S. Miller davem@davemloft.net 2008-03-29T02:51:40+00:00 9f09243890a4e7d2e06d40b56f26a64f88c6ec8b Signed-off-by: David S. Miller <davem@davemloft.net> 
Signed-off-by: David S. Miller <davem@davemloft.net>
[LLC]: station source mac address 2008-03-28T23:28:36+00:00 Joonwoo Park joonwpark81@gmail.com 2008-03-28T23:28:36+00:00 a5a04819c5740cb1aa217af2cc8f5ef26f33d744 kill unnecessary llc_station_mac_sa. Signed-off-by: Joonwoo Park <joonwpark81@gmail.com> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
kill unnecessary llc_station_mac_sa.

Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[LLC]: bogus llc packet length 2008-03-28T23:27:33+00:00 Joonwoo Park joonwpark81@gmail.com 2008-03-28T23:27:33+00:00 27785d83e4256fedeff45256d4c827fdcb47f2ce discard llc packet which has bogus packet length. Signed-off-by: Joonwoo Park <joonwpark81@gmail.com> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
discard llc packet which has bogus packet length.

Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[LLC]: Restrict LLC sockets to root 2008-03-28T03:28:10+00:00 Patrick McHardy kaber@trash.net 2008-03-28T03:28:10+00:00 3480c63bdf008e9289aab94418f43b9592978fff LLC currently allows users to inject raw frames, including IP packets encapsulated in SNAP. While Linux doesn't handle IP over SNAP, other systems do. Restrict LLC sockets to root similar to packet sockets. [ Modified Patrick's patch to use CAP_NEW_RAW --DaveM ] Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> 
LLC currently allows users to inject raw frames, including IP packets
encapsulated in SNAP. While Linux doesn't handle IP over SNAP, other
systems do. Restrict LLC sockets to root similar to packet sockets.

[ Modified Patrick's patch to use CAP_NEW_RAW --DaveM ]

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS. 2008-03-25T19:39:55+00:00 YOSHIFUJI Hideaki yoshfuji@linux-ipv6.org 2008-03-25T17:26:21+00:00 3b1e0a655f8eba44ab1ee2a1068d169ccfb853b9 Introduce per-sock inlines: sock_net(), sock_net_set() and per-inet_timewait_sock inlines: twsk_net(), twsk_net_set(). Without CONFIG_NET_NS, no namespace other than &init_net exists. Let's explicitly define them to help compiler optimizations. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> 
Introduce per-sock inlines: sock_net(), sock_net_set()
and per-inet_timewait_sock inlines: twsk_net(), twsk_net_set().
Without CONFIG_NET_NS, no namespace other than &init_net exists.
Let's explicitly define them to help compiler optimizations.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS. 2008-03-25T19:39:53+00:00 YOSHIFUJI Hideaki yoshfuji@linux-ipv6.org 2008-03-25T12:47:49+00:00 c346dca10840a874240c78efe3f39acf4312a1f2 Introduce per-net_device inlines: dev_net(), dev_net_set(). Without CONFIG_NET_NS, no namespace other than &init_net exists. Let's explicitly define them to help compiler optimizations. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> 
Introduce per-net_device inlines: dev_net(), dev_net_set().
Without CONFIG_NET_NS, no namespace other than &init_net exists.
Let's explicitly define them to help compiler optimizations.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
net: replace remaining __FUNCTION__ occurrences 2008-03-06T04:47:47+00:00 Harvey Harrison harvey.harrison@gmail.com 2008-03-06T04:47:47+00:00 0dc47877a3de00ceadea0005189656ae8dc52669 __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[LLC]: Use proc_create() to setup ->proc_fops first 2008-02-28T22:08:54+00:00 Wang Chen wangchen@cn.fujitsu.com 2008-02-28T22:08:54+00:00 7e0218099832d954d107f48de9e81bd521e16f24 Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to main tree. Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Use proc_create() to make sure that ->proc_fops be setup before gluing
PDE to main tree.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>