09 Dec, 2010

2 commits

• fe6c79157   Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Browse Code »

  Conflicts:
  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
  net/llc/af_llc.c

  David S. Miller

  2010-12-09 05:47:38 +0800  
• e8d34a884   l2tp: Fix modalias of l2tp_ip ... Browse Code »

  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
  Signed-off-by: David S. Miller

  Michal Marek

  2010-12-09 04:13:43 +0800  

18 Nov, 2010

1 commit

• 5811662b1   net: use the macros defined for the members of flowi ... Browse Code »

  Use the macros defined for the members of flowi to clean the code up.

  Signed-off-by: Changli Gao
  Signed-off-by: David S. Miller

  Changli Gao

  2010-11-18 04:27:45 +0800  

25 Oct, 2010

1 commit

• fc130840d   l2tp: make local function static ... Browse Code »

  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
  Acked-by: James Chapman
  Signed-off-by: David S. Miller

  stephen hemminger

  2010-10-25 05:55:47 +0800  

21 Oct, 2010

1 commit

• e83726b04   l2tp: small cleanup ... Browse Code »

  Signed-off-by: Eric Dumazet
  Signed-off-by: David S. Miller

  Eric Dumazet

  2010-10-21 19:39:09 +0800  

11 Jun, 2010

1 commit

• d8d1f30b9   net-next: remove useless union keyword ... Browse Code »

  remove useless union keyword in rtable, rt6_info and dn_route.

  Since there is only one member in a union, the union keyword isn't useful.

  Signed-off-by: Changli Gao
  Signed-off-by: Eric Dumazet
  Signed-off-by: David S. Miller

  Changli Gao

  2010-06-11 14:31:35 +0800  

16 Apr, 2010

1 commit

• 4e15ed4d9   net: replace ipfragok with skb->local_df ... Browse Code »

  As Herbert Xu said: we should be able to simply replace ipfragok
  with skb->local_df. commit f88037(sctp: Drop ipfargok in sctp_xmit function)
  has droped ipfragok and set local_df value properly.

  The patch kills the ipfragok parameter of .queue_xmit().

  Signed-off-by: Shan Wei
  Signed-off-by: David S. Miller

  Shan Wei

  2010-04-16 14:36:37 +0800  

04 Apr, 2010

1 commit

• 0d76751fa   l2tp: Add L2TPv3 IP encapsulation (no UDP) support ... Browse Code »

  This patch adds a new L2TPIP socket family and modifies the core to
  handle the case where there is no UDP header in the L2TP
  packet. L2TP/IP uses IP protocol 115. Since L2TP/UDP and L2TP/IP
  packets differ in layout, the datapath packet handling code needs
  changes too. Userspace uses an L2TPIP socket instead of a UDP socket
  when IP encapsulation is required.

  We can't use raw sockets for this because the semantics of raw sockets
  don't lend themselves to the socket-per-tunnel model - we need to

  Signed-off-by: David S. Miller

  James Chapman

  2010-04-04 05:56:04 +0800