1. 10 2月, 2008 20 次提交
    • J
      [NET_SCHED] sch_htb: htb_requeue fix · 21347456
      Jarek Poplawski 提交于
      htb_requeue() enqueues skbs for which htb_classify() returns NULL.
      This is wrong because such skbs could be handled by NET_CLS_ACT code,
      and the decision could be different than earlier in htb_enqueue().
      So htb_requeue() is changed to work and look more like htb_enqueue().
      Signed-off-by: NJarek Poplawski <jarkao2@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      21347456
    • R
      [IPV6]: Replace using the magic constant "1024" with IP6_RT_PRIO_USER for fc_metric. · 238fc7ea
      Rami Rosen 提交于
      This patch replaces the explicit usage of the magic constant "1024"
      with IP6_RT_PRIO_USER in the IPV6 tree.
      Signed-off-by: NRami Rosen <ramirose@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      238fc7ea
    • A
      starfire: secton fix · da219b7c
      Andrew Morton 提交于
      gcc-3.4.4 on powerpc:
      
      drivers/net/starfire.c:219: error: version causes a section type conflict
      
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      da219b7c
    • A
      via-velocity: section fix · 4f14b92f
      Andrew Morton 提交于
      From: Andrew Morton <akpm@linux-foundation.org>
      
      gcc-3.4.4 on powerpc:
      
      drivers/net/via-velocity.c:443: error: chip_info_table causes a section type conflict
      
      on this one I had to remove the __devinitdata too.  Don't know why.
      
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4f14b92f
    • A
      natsemi: section fix · aa738adf
      Andrew Morton 提交于
      gcc-3.4.4 on powerpc:
      
      drivers/net/natsemi.c:245: error: natsemi_pci_info causes a section type conflict
      
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      aa738adf
    • A
      typhoon: section fix · 952b3494
      Andrew Morton 提交于
      gcc-3.4.4 on powerpc:
      
      drivers/net/typhoon.c:137: error: version causes a section type conflict
      
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      952b3494
    • S
      isdn: fix section mismatch warning for ISACVer · f4e64333
      Sam Ravnborg 提交于
      Fix following warnings:
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x19723): Section mismatch in reference from the function ISACVersion() to the variable .devinit.data:ISACVer
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x2005b): Section mismatch in reference from the function setup_avm_a1_pcmcia() to the function .devinit.text:setup_isac()
      
      ISACVer were only used from function annotated __devinit
      so add same annotation to ISACVer.
      One af the fererencing functions missed __devinit so add it
      and kill an additional warning.
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      Acked-by: NKarsten Keil <kkeil@suse.de>
      Cc: Jeff Garzik <jgarzik@pobox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f4e64333
    • S
      isdn: fix section mismatch warnings from hisax_cs_setup_card · 2fddb6e2
      Sam Ravnborg 提交于
      Fix the following warnings:
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x722): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_teles3()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x72c): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_s0box()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x736): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_telespci()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x747): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_avm_pcipnp()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x74e): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_elsa()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x755): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_diva()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x75c): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_sedlbauer()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x763): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_netjet_s()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x76a): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_hfcpci()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x771): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_hfcsx()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x778): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_niccy()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x77f): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_bkm_a4t()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x786): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_sct_quadro()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x78d): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_gazel()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x794): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_w6692()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x79b): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_netjet_u()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x7a2): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_enternow_pci()
      
      checkcard() are the only user of hisax_cs_setup_card().
      And checkcard is only used during init or when hot plugging
      ISDN devices. So annotate hisax_cs_setup_card() with __devinit.
      checkcard() is used by exported functions so it cannot be
      annotated __devinit. Annotate it with __ref so modpost
      ignore references to _devinit section.
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      Acked-by: NKarsten Keil <kkeil@suse.de>
      Cc: Jeff Garzik <jgarzik@pobox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2fddb6e2
    • S
      isdn: fix section mismatch warnings in isac.c and isar.c · d348c2a3
      Sam Ravnborg 提交于
      Fix the following warnings:
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x1b276): Section mismatch in reference from the function inithscxisac() to the function .devinit.text:clear_pending_isac_ints()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x1b286): Section mismatch in reference from the function inithscxisac() to the function .devinit.text:initisac()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x1fec7): Section mismatch in reference from the function AVM_card_msg() to the function .devinit.text:clear_pending_isac_ints()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x21669): Section mismatch in reference from the function AVM_card_msg() to the function .devinit.text:clear_pending_isac_ints()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x21671): Section mismatch in reference from the function AVM_card_msg() to the function .devinit.text:initisac()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x2991e): Section mismatch in reference from the function Sedl_card_msg() to the function .devinit.text:clear_pending_isac_ints()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x29936): Section mismatch in reference from the function Sedl_card_msg() to the function .devinit.text:initisac()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x2993e): Section mismatch in reference from the function Sedl_card_msg() to the function .devinit.text:initisar()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x2e026): Section mismatch in reference from the function NETjet_S_card_msg() to the function .devinit.text:clear_pending_isac_ints()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x2e02e): Section mismatch in reference from the function NETjet_S_card_msg() to the function .devinit.text:initisac()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x37813): Section mismatch in reference from the function BKM_card_msg() to the function .devinit.text:clear_pending_isac_ints()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x37823): Section mismatch in reference from the function BKM_card_msg() to the function .devinit.text:initisac()
      
      initisar(), initisac() and clear_pending_isac_ints()
      were all used via a cardmsg fnction - which may be called
      ouside __devinit context.
      So remove the bogus __devinit annotation of the
      above three functions to fix the warnings.
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      Acked-by: NKarsten Keil <kkeil@suse.de>
      Cc: Jeff Garzik <jgarzik@pobox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d348c2a3
    • S
      isdn: fix section mismatch warning in hfc_sx.c · 7740ac6a
      Sam Ravnborg 提交于
      Fix the following warning:
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x35818): Section mismatch in reference from the function hfcsx_card_msg() to the function .devinit.text:inithfcsx()
      
      hfcsx_card_msg() may be called outside __devinit context.
      Following the program logic is looks like the CARD_INIT branch
      will only be taken under __devinit context but to be consistent
      remove the __devinit annotation of inithfcsx() so we
      do not mix non-__devinit and __devinit code.
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      Acked-by: NKarsten Keil <kkeil@suse.de>
      Cc: Jeff Garzik <jgarzik@pobox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7740ac6a
    • S
      [PKT_SCHED] ematch: tcf_em_destroy robustness · 954415e3
      Stephen Hemminger 提交于
      Make the code in tcf_em_tree_destroy more robust and cleaner:
       * Don't need to cast pointer to kfree() or avoid passing NULL.
       * After freeing the tree, clear the pointer to avoid possible problems
      from repeated free.
      Signed-off-by: NStephen Hemminger <shemminger@vyatta.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      954415e3
    • S
      [PKT_SCHED]: deinline functions in meta match · ed7af3b3
      Stephen Hemminger 提交于
      A couple of functions in meta match don't need to be inline.
      Signed-off-by: NStephen Hemminger <shemminger@vyatta.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ed7af3b3
    • P
      [SCTP]: Convert sctp_dbg_objcnt to seq files. · 8ff65b46
      Pavel Emelyanov 提交于
      This makes the code use a good proc API and the text ~50 bytes shorter.
      Signed-off-by: NPavel Emelyanov <xemul@openvz.org>
      Acked-by: NVlad Yasevich <vladislav.yasevich@hp.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8ff65b46
    • P
      [SCTP]: Use snmp_fold_field instead of a homebrew analogue. · 3f5340a6
      Pavel Emelyanov 提交于
      SCPT already depends in INET, so this doesn't create additional
      dependencies.
      Signed-off-by: NPavel Emelyanov <xemul@openvz.org>
      Acked-by: NVlad Yasevich <vladislav.yasevich@hp.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3f5340a6
    • D
      [IGMP]: Optimize kfree_skb in igmp_rcv. · cd557bc1
      Denis V. Lunev 提交于
      Merge error paths inside igmp_rcv.
      Signed-off-by: NDenis V. Lunev <den@openvz.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      cd557bc1
    • P
      [KEY]: Convert net/pfkey to use seq files. · bd2f7476
      Pavel Emelyanov 提交于
      The seq files API disposes the caller of the difficulty of
      checking file position, the length of data to produce and
      the size of provided buffer.
      Signed-off-by: NPavel Emelyanov <xemul@openvz.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bd2f7476
    • P
      [KEY]: Clean up proc files creation a bit. · 61145aa1
      Pavel Emelyanov 提交于
      Mainly this removes ifdef-s from inside the ipsec_pfkey_init.
      Signed-off-by: NPavel Emelyanov <xemul@openvz.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      61145aa1
    • A
      pppol2tp: fix printk warnings · 0efeaa33
      Andrew Morton 提交于
      drivers/net/pppol2tp.c: In function `pppol2tp_seq_tunnel_show':
      drivers/net/pppol2tp.c:2295: warning: long long unsigned int format, __u64 arg (arg 4)
      drivers/net/pppol2tp.c:2295: warning: long long unsigned int format, __u64 arg (arg 5)
      drivers/net/pppol2tp.c:2295: warning: long long unsigned int format, __u64 arg (arg 6)
      drivers/net/pppol2tp.c:2295: warning: long long unsigned int format, __u64 arg (arg 7)
      drivers/net/pppol2tp.c:2295: warning: long long unsigned int format, __u64 arg (arg 8)
      drivers/net/pppol2tp.c:2295: warning: long long unsigned int format, __u64 arg (arg 9)
      drivers/net/pppol2tp.c: In function `pppol2tp_seq_session_show':
      drivers/net/pppol2tp.c:2328: warning: long long unsigned int format, __u64 arg (arg 5)
      drivers/net/pppol2tp.c:2328: warning: long long unsigned int format, __u64 arg (arg 6)
      drivers/net/pppol2tp.c:2328: warning: long long unsigned int format, __u64 arg (arg 7)
      drivers/net/pppol2tp.c:2328: warning: long long unsigned int format, __u64 arg (arg 8)
      drivers/net/pppol2tp.c:2328: warning: long long unsigned int format, __u64 arg (arg 9)
      drivers/net/pppol2tp.c:2328: warning: long long unsigned int format, __u64 arg (arg 10)
      
      Not all platforms implement u64 with unsigned long long.  eg: powerpc.
      
      Cc: Jeff Garzik <jeff@garzik.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0efeaa33
    • A
      bnx2: section fix · fefa8645
      Andrew Morton 提交于
      gcc-3.4.4 on powerpc:
      
      drivers/net/bnx2.c:67: error: version causes a section type conflict
      
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fefa8645
    • A
      bnx2x: section fix · 53a10565
      Andrew Morton 提交于
      From: Andrew Morton <akpm@linux-foundation.org>
      
      gcc-3.4.4 on powerpc:
      
      drivers/net/bnx2x.c:73: error: version causes a section type conflict
      
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      53a10565
  2. 09 2月, 2008 20 次提交