Igloo kernel https://git.etezian.org/cgit.cgi/snowball/igloo-kernel.git/atom?h=u0 2010-12-08T21:47:38+00:00 2010-12-08T21:47:38+00:00 David S. Miller davem@davemloft.net 2010-12-08T21:15:38+00:00 urn:sha1:fe6c791570efe717946ea7b7dd50aec96b70d551 Conflicts: drivers/net/wireless/ath/ath9k/ar9003_eeprom.c net/llc/af_llc.c 2010-12-08T20:13:43+00:00 Michal Marek mmarek@suse.cz 2010-12-06T02:39:12+00:00 urn:sha1:e8d34a884e4ff118920bb57664def8a73b1b784f Using the SOCK_DGRAM enum results in "net-pf-2-proto-SOCK_DGRAM-type-115", so use the numeric value like it is done in net/dccp. Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: David S. Miller <davem@davemloft.net> 2010-11-17T20:27:45+00:00 Changli Gao xiaosuo@gmail.com 2010-11-12T18:43:55+00:00 urn:sha1:5811662b15db018c740c57d037523683fd3e6123 Use the macros defined for the members of flowi to clean the code up. Signed-off-by: Changli Gao <xiaosuo@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2010-11-01T13:56:02+00:00 Dr. David Alan Gilbert linux@treblig.org 2010-10-31T07:26:03+00:00 urn:sha1:6f9b901823aafd14a84ae27f61ff28bafed01260 'sparse' spotted that the parameters to kzalloc in l2tp_dfs_seq_open were swapped. Tested on current git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git at 1792f17b7210280a3d7ff29da9614ba779cfcedb build, boots and I can see that directory, but there again I could see /sys/kernel/debug/l2tp with it swapped; I don't have any l2tp in use. Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> Signed-off-by: David S. Miller <davem@davemloft.net> 2010-10-25T05:26:41+00:00 Stephen Rothwell sfr@canb.auug.org.au 2010-10-25T05:26:41+00:00 urn:sha1:e341b2ddc1e8e5ff998ac5462dc5138775d1d492 Causes these build failures on PowerPC: net/l2tp/l2tp_core.c:1228: error: __ksymtab_l2tp_tunnel_closeall causes a section type conflict net/l2tp/l2tp_core.c:1228: error: __ksymtab_l2tp_tunnel_closeall causes a section type conflict net/l2tp/l2tp_core.c:1006: error: __ksymtab_l2tp_xmit_core causes a section type conflict net/l2tp/l2tp_core.c:1006: error: __ksymtab_l2tp_xmit_core causes a section type conflict net/l2tp/l2tp_core.c:847: error: __ksymtab_l2tp_udp_recv_core causes a section type conflict net/l2tp/l2tp_core.c:847: error: __ksymtab_l2tp_udp_recv_core causes a section type conflict Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> 2010-10-24T21:55:47+00:00 stephen hemminger shemminger@vyatta.com 2010-10-21T07:50:46+00:00 urn:sha1:fc130840d75d42c5a360fd1d8b72489eec09cad3 Also moved the refcound inlines from l2tp_core.h to l2tp_core.c since only used in that one file. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: James Chapman <jchapman@katalix.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2010-10-21T11:39:09+00:00 Eric Dumazet eric.dumazet@gmail.com 2010-10-21T11:39:09+00:00 urn:sha1:e83726b0460f4741c8f10e1488fbcc0a9e5f0b7e Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2010-09-22T01:04:47+00:00 Eric Dumazet eric.dumazet@gmail.com 2010-09-21T06:43:54+00:00 urn:sha1:756e64a0b106f1a2ca96889c39ea0d48131105c0 Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2010-09-10T05:27:33+00:00 David S. Miller davem@davemloft.net 2010-09-10T05:27:33+00:00 urn:sha1:e548833df83c3554229eff0672900bfe958b45fd Conflicts: net/mac80211/main.c 2010-09-02T16:19:32+00:00 Eric Dumazet eric.dumazet@gmail.com 2010-09-02T16:19:32+00:00 urn:sha1:95f4b45bc688b03107f5452ccda29496fc1b4ecf Kill last_rx use in l2tp and two net drivers Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>