1. 11 11月, 2008 28 次提交
  2. 08 11月, 2008 4 次提交
  3. 07 11月, 2008 8 次提交
    • D
    • K
      fmvj18x_cs: write interrupt ack bit for lan and modem to work simultaneously. · a8272061
      Komuro 提交于
      Write interrupt ack bit in fjn_interrupt for lan and modem to work
      simultaneously.
      Signed-off-by: NKomuro <komurojun-mbn@nifty.com>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      a8272061
    • H
      phonet: sparse annotations of protocol, remove forward declaration · 5c7f0333
      Harvey Harrison 提交于
      net/phonet/af_phonet.c:38:36: error: marked inline, but without a definition
      net/phonet/pep-gprs.c:63:10: warning: incorrect type in return expression (different base types)
      net/phonet/pep-gprs.c:63:10:    expected int
      net/phonet/pep-gprs.c:63:10:    got restricted __be16 [usertype] <noident>
      net/phonet/pep-gprs.c:65:10: warning: incorrect type in return expression (different base types)
      net/phonet/pep-gprs.c:65:10:    expected int
      net/phonet/pep-gprs.c:65:10:    got restricted __be16 [usertype] <noident>
      net/phonet/pep-gprs.c:124:16: warning: incorrect type in assignment (different base types)
      net/phonet/pep-gprs.c:124:16:    expected restricted __be16 [usertype] protocol
      net/phonet/pep-gprs.c:124:16:    got unsigned short [unsigned] [usertype] protocol
      Signed-off-by: NHarvey Harrison <harvey.harrison@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5c7f0333
    • H
      ipvs: oldlen, newlen should be be16, not be32 · ca62059b
      Harvey Harrison 提交于
      Noticed by sparse:
      net/netfilter/ipvs/ip_vs_proto_tcp.c:195:6: warning: incorrect type in argument 5 (different base types)
      net/netfilter/ipvs/ip_vs_proto_tcp.c:195:6:    expected restricted __be16 [usertype] oldlen
      net/netfilter/ipvs/ip_vs_proto_tcp.c:195:6:    got restricted __be32 [usertype] <noident>
      net/netfilter/ipvs/ip_vs_proto_tcp.c:196:6: warning: incorrect type in argument 6 (different base types)
      net/netfilter/ipvs/ip_vs_proto_tcp.c:196:6:    expected restricted __be16 [usertype] newlen
      net/netfilter/ipvs/ip_vs_proto_tcp.c:196:6:    got restricted __be32 [usertype] <noident>
      net/netfilter/ipvs/ip_vs_proto_tcp.c:270:6: warning: incorrect type in argument 5 (different base types)
      net/netfilter/ipvs/ip_vs_proto_tcp.c:270:6:    expected restricted __be16 [usertype] oldlen
      net/netfilter/ipvs/ip_vs_proto_tcp.c:270:6:    got restricted __be32 [usertype] <noident>
      net/netfilter/ipvs/ip_vs_proto_tcp.c:271:6: warning: incorrect type in argument 6 (different base types)
      net/netfilter/ipvs/ip_vs_proto_tcp.c:271:6:    expected restricted __be16 [usertype] newlen
      net/netfilter/ipvs/ip_vs_proto_tcp.c:271:6:    got restricted __be32 [usertype] <noident>
      net/netfilter/ipvs/ip_vs_proto_udp.c:206:6: warning: incorrect type in argument 5 (different base types)
      net/netfilter/ipvs/ip_vs_proto_udp.c:206:6:    expected restricted __be16 [usertype] oldlen
      net/netfilter/ipvs/ip_vs_proto_udp.c:206:6:    got restricted __be32 [usertype] <noident>
      net/netfilter/ipvs/ip_vs_proto_udp.c:207:6: warning: incorrect type in argument 6 (different base types)
      net/netfilter/ipvs/ip_vs_proto_udp.c:207:6:    expected restricted __be16 [usertype] newlen
      net/netfilter/ipvs/ip_vs_proto_udp.c:207:6:    got restricted __be32 [usertype] <noident>
      net/netfilter/ipvs/ip_vs_proto_udp.c:282:6: warning: incorrect type in argument 5 (different base types)
      net/netfilter/ipvs/ip_vs_proto_udp.c:282:6:    expected restricted __be16 [usertype] oldlen
      net/netfilter/ipvs/ip_vs_proto_udp.c:282:6:    got restricted __be32 [usertype] <noident>
      net/netfilter/ipvs/ip_vs_proto_udp.c:283:6: warning: incorrect type in argument 6 (different base types)
      net/netfilter/ipvs/ip_vs_proto_udp.c:283:6:    expected restricted __be16 [usertype] newlen
      net/netfilter/ipvs/ip_vs_proto_udp.c:283:6:    got restricted __be32 [usertype] <noident>
      Signed-off-by: NHarvey Harrison <harvey.harrison@gmail.com>
      Acked-by: NSimon Horman <horms@verge.net.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ca62059b
    • A
      net: mark flow_cache_cpu_prepare() as __init · 76acfdb9
      Alexey Dobriyan 提交于
      It's called from __init code only. And__devinit in generic networking code
      is pretty strange :^)
      Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      76acfdb9
    • D
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 9eeda9ab
      David S. Miller 提交于
      Conflicts:
      
      	drivers/net/wireless/ath5k/base.c
      	net/8021q/vlan_core.c
      9eeda9ab
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 4bab0ea1
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        net: Fix recursive descent in __scm_destroy().
        iwl3945: fix deadlock on suspend
        iwl3945: do not send scan command if channel count zero
        iwl3945: clear scanning bits upon failure
        ath5k: correct handling of rx status fields
        zd1211rw: Add 2 device IDs
        Fix logic error in rfkill_check_duplicity
        iwlagn: avoid sleep in softirq context
        iwlwifi: clear scanning bits upon failure
        Revert "ath5k: honor FIF_BCN_PRBRESP_PROMISC in STA mode"
        tcp: Fix recvmsg MSG_PEEK influence of blocking behavior.
        netfilter: netns ct: walk netns list under RTNL
        ipv6: fix run pending DAD when interface becomes ready
        net/9p: fix printk format warnings
        net: fix packet socket delivery in rx irq handler
        xfrm: Have af-specific init_tempsel() initialize family field of temporary selector
      4bab0ea1
    • L
      Merge branch 'x86-fixes-for-linus' of... · a15a82f4
      Linus Torvalds 提交于
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        Revert "x86: default to reboot via ACPI"
        x86: align DirectMap in /proc/meminfo
        AMD IOMMU: fix lazy IO/TLB flushing in unmap path
        x86: add smp_mb() before sending INVALIDATE_TLB_VECTOR
        x86: remove VISWS and PARAVIRT around NR_IRQS puzzle
        x86: mention ACPI in top-level Kconfig menu
        x86: size NR_IRQS on 32-bit systems the same way as 64-bit
        x86: don't allow nr_irqs > NR_IRQS
        x86/docs: remove noirqbalance param docs
        x86: don't use tsc_khz to calculate lpj if notsc is passed
        x86, voyager: fix smp_intr_init() compile breakage
        AMD IOMMU: fix detection of NP capable IOMMUs
      a15a82f4