1. 20 Oct, 2008 4 commits
  2. 16 Oct, 2008 6 commits
  3. 15 Oct, 2008 23 commits
  4. 14 Oct, 2008 7 commits
    • Randy Macleod's avatar
      Phonet: Simple doc fix. · 3497b2f2
      Randy Macleod authored
      From: "Randy Macleod" <macleodr@nortel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3497b2f2
    • Pablo Neira Ayuso's avatar
      netfilter: ctnetlink: remove bogus module dependency between ctnetlink and nf_nat · e6a7d3c0
      Pablo Neira Ayuso authored
      This patch removes the module dependency between ctnetlink and
      nf_nat by means of an indirect call that is initialized when
      nf_nat is loaded. Now, nf_conntrack_netlink only requires
      nf_conntrack and nfnetlink.
      
      This patch puts nfnetlink_parse_nat_setup_hook into the
      nf_conntrack_core to avoid dependencies between ctnetlink,
      nf_conntrack_ipv4 and nf_conntrack_ipv6.
      
      This patch also introduces the function ctnetlink_change_nat
      that is only invoked from the creation path. Actually, the
      nat handling cannot be invoked from the update path since
      this is not allowed. By introducing this function, we remove
      the useless nat handling in the update path and we avoid
      deadlock-prone code.
      
      This patch also adds the required EAGAIN logic for nfnetlink.
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e6a7d3c0
    • Patrick McHardy's avatar
      netfilter: fix ebtables dependencies · 129404a1
      Patrick McHardy authored
      Ingo Molnar reported a build error with ebtables:
      
      ERROR: "ebt_register_table" [net/bridge/netfilter/ebtable_filter.ko] undefined!
      ERROR: "ebt_do_table" [net/bridge/netfilter/ebtable_filter.ko] undefined!
      ERROR: "ebt_unregister_table" [net/bridge/netfilter/ebtable_filter.ko] undefined!
      ERROR: "ebt_register_table" [net/bridge/netfilter/ebtable_broute.ko] undefined!
      ERROR: "ebt_do_table" [net/bridge/netfilter/ebtable_broute.ko] undefined!
      ERROR: "ebt_unregister_table" [net/bridge/netfilter/ebtable_broute.ko] undefined!
      make[1]: *** [__modpost] Error 1
      make: *** [modules] Error 2
      
      This reason is a missing dependencies that got lost during Kconfig cleanups.
      Restore it.
      Tested-by: default avatarIngo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      129404a1
    • Patrick McHardy's avatar
      netfilter: restore lost #ifdef guarding defrag exception · 38f7ac3e
      Patrick McHardy authored
      Nir Tzachar <nir.tzachar@gmail.com> reported a warning when sending
      fragments over loopback with NAT:
      
      [ 6658.338121] WARNING: at net/ipv4/netfilter/nf_nat_standalone.c:89 nf_nat_fn+0x33/0x155()
      
      The reason is that defragmentation is skipped for already tracked connections.
      This is wrong in combination with NAT and ip_conntrack actually had some ifdefs
      to avoid this behaviour when NAT is compiled in.
      
      The entire "optimization" may seem a bit silly, for now simply restoring the
      lost #ifdef is the easiest solution until we can come up with something better.
      Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      38f7ac3e
    • Ron Mercer's avatar
      qlge: Fix page size ifdef test. · 48501371
      Ron Mercer authored
      This ASIC does support all page sizes. For 4k and 8k page size the TX
      control block needs an external scatter gather list.  For page sizes
      larger than 8k the max frags is satisfied by the original TX control
      block.
      Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      48501371
    • Alan Cox's avatar
      net: Rationalise email address: Network Specific Parts · 113aa838
      Alan Cox authored
      Clean up the various different email addresses of mine listed in the code
      to a single current and valid address. As Dave says his network merges
      for 2.6.28 are now done this seems a good point to send them in where
      they won't risk disrupting real changes.
      Signed-off-by: default avatarAlan Cox <alan@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      113aa838
    • Heiko Carstens's avatar
      dsa: fix compile bug on s390 · 510149e3
      Heiko Carstens authored
      git commit 45cec1ba
      "dsa: Need to select PHYLIB." causes this build bug on s390:
      
      drivers/built-in.o: In function `phy_stop_interrupts':
      /home/heicarst/linux-2.6/drivers/net/phy/phy.c:631: undefined reference to `free_irq'
      /home/heicarst/linux-2.6/drivers/net/phy/phy.c:646: undefined reference to `enable_irq'
      drivers/built-in.o: In function `phy_start_interrupts':
      /home/heicarst/linux-2.6/drivers/net/phy/phy.c:601: undefined reference to `request_irq'
      drivers/built-in.o: In function `phy_interrupt':
      /home/heicarst/linux-2.6/drivers/net/phy/phy.c:528: undefined reference to `disable_irq_nosync'
      drivers/built-in.o: In function `phy_change':
      /home/heicarst/linux-2.6/drivers/net/phy/phy.c:674: undefined reference to `enable_irq'
      /home/heicarst/linux-2.6/drivers/net/phy/phy.c:692: undefined reference to `disable_irq'
      
      PHYLIB has alread a depend on !S390, however select PHYLIB at DSA overrides
      that unfortunately. So add a depend on !S390 to DSA as well.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      510149e3