1. 25 10月, 2011 40 次提交
    • L
      Merge branch 'for-next' of git://git.linaro.org/people/triad/linux-pinctrl · c9d6329c
      Linus Torvalds 提交于
      * 'for-next' of git://git.linaro.org/people/triad/linux-pinctrl:
        pinctrl/sirf: fix sirfsoc_get_group_pins prototype
        pinctrl: Don't copy function name when requesting a pin
        pinctrl: Don't copy pin names when registering them
        pinctrl: Remove unsafe __refdata
        pinctrl: get_group_pins() const fixes
        pinctrl: add a driver for the CSR SiRFprimaII pinmux
        pinctrl: add a driver for the U300 pinmux
        drivers: create a pin control subsystem
      c9d6329c
    • L
      Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regmap · 4e7e2a20
      Linus Torvalds 提交于
      * 'for-linus' of git://opensource.wolfsonmicro.com/regmap: (62 commits)
        mfd: Enable rbtree cache for wm831x devices
        regmap: Support some block operations on cached devices
        regmap: Allow caches for devices with no defaults
        regmap: Ensure rbtree syncs registers set to zero properly
        regmap: Allow rbtree to cache zero default values
        regmap: Warn on raw I/O as well as bulk reads that bypass cache
        regmap: Return a sensible error code if we fail to read the cache
        regmap: Use bsearch() to search the register defaults
        regmap: Fix doc comment
        regmap: Optimize the lookup path to use binary search
        regmap: Ensure we scream if we enable cache bypass/only at the same time
        regmap: Implement regcache_cache_bypass helper function
        regmap: Save/restore the bypass state upon syncing
        regmap: Lock the sync path, ensure we use the lockless _regmap_write()
        regmap: Fix apostrophe usage
        regmap: Make _regmap_write() global
        regmap: Fix lock used for regcache_cache_only()
        regmap: Grab the lock in regcache_cache_only()
        regmap: Modify map->cache_bypass directly
        regmap: Fix regcache_sync generic implementation
        ...
      4e7e2a20
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 8a9ea323
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
        dp83640: free packet queues on remove
        dp83640: use proper function to free transmit time stamping packets
        ipv6: Do not use routes from locally generated RAs
        |PATCH net-next] tg3: add tx_dropped counter
        be2net: don't create multiple RX/TX rings in multi channel mode
        be2net: don't create multiple TXQs in BE2
        be2net: refactor VF setup/teardown code into be_vf_setup/clear()
        be2net: add vlan/rx-mode/flow-control config to be_setup()
        net_sched: cls_flow: use skb_header_pointer()
        ipv4: avoid useless call of the function check_peer_pmtu
        TCP: remove TCP_DEBUG
        net: Fix driver name for mdio-gpio.c
        ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
        rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
        ipv4: fix ipsec forward performance regression
        jme: fix irq storm after suspend/resume
        route: fix ICMP redirect validation
        net: hold sock reference while processing tx timestamps
        tcp: md5: add more const attributes
        Add ethtool -g support to virtio_net
        ...
      
      Fix up conflicts in:
       - drivers/net/Kconfig:
      	The split-up generated a trivial conflict with removal of a
      	stale reference to Documentation/networking/net-modules.txt.
      	Remove it from the new location instead.
       - fs/sysfs/dir.c:
      	Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
      	with Eric Biederman's changes for tagged directories.
      8a9ea323
    • L
      Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 1be025d3
      Linus Torvalds 提交于
      * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (260 commits)
        usb: renesas_usbhs: fixup inconsistent return from usbhs_pkt_push()
        usb/isp1760: Allow to optionally trigger low-level chip reset via GPIOLIB.
        USB: gadget: midi: memory leak in f_midi_bind_config()
        USB: gadget: midi: fix range check in f_midi_out_open()
        QE/FHCI: fixed the CONTROL bug
        usb: renesas_usbhs: tidyup for smatch warnings
        USB: Fix USB Kconfig dependency problem on 85xx/QoirQ platforms
        EHCI: workaround for MosChip controller bug
        usb: gadget: file_storage: fix race on unloading
        USB: ftdi_sio.c: Use ftdi async_icount structure for TIOCMIWAIT, as in other drivers
        USB: ftdi_sio.c:Fill MSR fields of the ftdi async_icount structure
        USB: ftdi_sio.c: Fill LSR fields of the ftdi async_icount structure
        USB: ftdi_sio.c:Fill TX field of the ftdi async_icount structure
        USB: ftdi_sio.c: Fill the RX field of the ftdi async_icount structure
        USB: ftdi_sio.c: Basic icount infrastructure for ftdi_sio
        usb/isp1760: Let OF bindings depend on general CONFIG_OF instead of PPC_OF .
        USB: ftdi_sio: Support TI/Luminary Micro Stellaris BD-ICDI Board
        USB: Fix runtime wakeup on OHCI
        xHCI/USB: Make xHCI driver have a BOS descriptor.
        usb: gadget: add new usb gadget for ACM and mass storage
        ...
      1be025d3
    • L
      Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 2d03423b
      Linus Torvalds 提交于
      * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (38 commits)
        mm: memory hotplug: Check if pages are correctly reserved on a per-section basis
        Revert "memory hotplug: Correct page reservation checking"
        Update email address for stable patch submission
        dynamic_debug: fix undefined reference to `__netdev_printk'
        dynamic_debug: use a single printk() to emit messages
        dynamic_debug: remove num_enabled accounting
        dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions
        uio: Support physical addresses >32 bits on 32-bit systems
        sysfs: add unsigned long cast to prevent compile warning
        drivers: base: print rejected matches with DEBUG_DRIVER
        memory hotplug: Correct page reservation checking
        memory hotplug: Refuse to add unaligned memory regions
        remove the messy code file Documentation/zh_CN/SubmitChecklist
        ARM: mxc: convert device creation to use platform_device_register_full
        new helper to create platform devices with dma mask
        docs/driver-model: Update device class docs
        docs/driver-model: Document device.groups
        kobj_uevent: Ignore if some listeners cannot handle message
        dynamic_debug: make netif_dbg() call __netdev_printk()
        dynamic_debug: make netdev_dbg() call __netdev_printk()
        ...
      2d03423b
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 59e52534
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)
        MAINTAINERS: linux-m32r is moderated for non-subscribers
        linux@lists.openrisc.net is moderated for non-subscribers
        Drop default from "DM365 codec select" choice
        parisc: Kconfig: cleanup Kernel page size default
        Kconfig: remove redundant CONFIG_ prefix on two symbols
        cris: remove arch/cris/arch-v32/lib/nand_init.S
        microblaze: add missing CONFIG_ prefixes
        h8300: drop puzzling Kconfig dependencies
        MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
        tty: drop superfluous dependency in Kconfig
        ARM: mxc: fix Kconfig typo 'i.MX51'
        Fix file references in Kconfig files
        aic7xxx: fix Kconfig references to READMEs
        Fix file references in drivers/ide/
        thinkpad_acpi: Fix printk typo 'bluestooth'
        bcmring: drop commented out line in Kconfig
        btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
        doc: raw1394: Trivial typo fix
        CIFS: Don't free volume_info->UNC until we are entirely done with it.
        treewide: Correct spelling of successfully in comments
        ...
      59e52534
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm · 73692d9b
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
        apm-emulation: use wait_event_freezable() instead of freezer_[do_not_]count()
      73692d9b
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 31dced41
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (61 commits)
        HID: hid-magicmouse: Magic Trackpad has 1 button, not 2
        HID: Add device IDs for more SJOY adapters
        HID: primax: remove spurious dependency
        HID: support primax keyboards violating USB HID spec
        HID: usbhid: cancel timer for retry synchronously
        HID: wacom: Set input bits before registration
        HID: consolidate MacbookAir 4,1 mappings
        HID: MacbookAir4,1 and MacbookAir4,2 need entry in hid_mouse_ignore_list[]
        HID: Add support MacbookAir 4,1 keyboard
        HID: hidraw: open count should not increase if error
        HID: hiddev: potential info leak in hiddev_ioctl()
        HID: multitouch: decide if hid-multitouch needs to handle mt devices
        HID: add autodetection of multitouch devices
        HID: "hid-logitech" driver with Logitech Driving Force GT
        HID: hid-logitech-dj: fix off by one
        HID: hidraw: protect hidraw_disconnect() better
        HID: hid-multitouch: add support for the IDEACOM 6650 chip
        HID: Add full support for Logitech Unifying receivers
        HID: hidraw: free list for all error in hidraw_open
        HID: roccat: Kone now reports external profile changes via roccat device
        ...
      31dced41
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 7c1953dd
      Linus Torvalds 提交于
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (62 commits)
        target: Fix compile warning w/ missing module.h include
        target: Remove legacy se_task->task_timer and associated logic
        target: Fix incorrect transport_sent usage
        target: re-use the command S/G list for single-task commands
        target: Fix BIDI t_task_cdb handling in transport_generic_new_cmd
        target: remove transport_allocate_tasks
        target: merge transport_new_cmd_obj into transport_generic_new_cmd
        target: remove the task_sg_bidi field se_task and pSCSI BIDI support
        target: transport_subsystem_check_init cleanups
        target: use a workqueue for I/O completions
        target: remove unused TRANSPORT_ states
        target: remove TRANSPORT_DEFERRED_CMD state
        target: remove the TRANSPORT_REMOVE state
        target: move depth_left manipulation out of transport_generic_request_failure
        target: stop task timers earlier
        target: remove TF_TIMER_STOP
        target: factor some duplicate code for stopping a task
        target: fix list walking in transport_free_dev_tasks
        target: use transport_cmd_check_stop_to_fabric consistently
        target: do not pass the queue object to transport_remove_cmd_from_queue
        ...
      7c1953dd
    • J
      pinctrl/sirf: fix sirfsoc_get_group_pins prototype · ad7761ab
      Jean-Christophe PLAGNIOL-VILLARD 提交于
      fix sirfsoc_get_group_pins prototype introduced in 7e570f97, we
      missed to de-constify a pointer.
      Signed-off-by: NJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
      Acked-by: NStephen Warren <swarren@nvidia.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      ad7761ab
    • L
      Merge branch 'for-linus' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · 1bc67188
      Linus Torvalds 提交于
      * 'for-linus' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (81 commits)
        ARM: 7133/1: SMP: fix per cpu timer setup before the cpu is marked online
        ARM: 7129/1: Add __arm_ioremap_exec for mapping external memory as MT_MEMORY
        ARM: 7136/1: pl330: Fix a race condition
        ARM: smp: fix clipping of number of CPUs
        ARM: 7137/1: Fix error upon adding LL debug
        ARM: Add a few machine types to mach-types
        ARM: 7130/1: dev_archdata: add private iommu extension
        ARM: 7125/1: Add unwinding annotations for 64bit division functions
        ARM: 7120/1: remove bashism in check for multiple zreladdrs
        ARM: 7118/1: rename temp variable in read*_relaxed()
        ARM: 6217/4: mach-realview: expose PB1176 ROM using physmap and map_rom
        ARM: 7098/1: kdump: copy kernel relocation code at the kexec prepare stage
        ARM: 7062/1: cache: detect PIPT I-cache using CTR
        ARM: platform fixups: remove mdesc argument to fixup function
        ARM: 7017/1: Use generic BUG() handler
        ARM: 7102/1: mach-integrator: update defconfig
        ARM: 7087/2: mach-integrator: get timer frequency from clock
        ARM: 7086/2: mach-integrator: modernize clock event registration
        ARM: 7085/2: mach-integrator: clockevent supports oneshot mode
        ARM: 7084/1: mach-integrator: retire some timer macros
        ...
      1bc67188
    • J
      Merge branch 'upstream' into for-linus · b3aec7b6
      Jiri Kosina 提交于
      Conflicts:
      	drivers/hid/hid-core.c
      	drivers/hid/hid-ids.h
      b3aec7b6
    • J
      Merge branch 'upstream-fixes' into for-linus · f6f12427
      Jiri Kosina 提交于
      Conflicts:
      	drivers/hid/hid-wacom.c
      f6f12427
    • J
    • L
      Merge branch 'next' of git://selinuxproject.org/~jmorris/linux-security · 36b8d186
      Linus Torvalds 提交于
      * 'next' of git://selinuxproject.org/~jmorris/linux-security: (95 commits)
        TOMOYO: Fix incomplete read after seek.
        Smack: allow to access /smack/access as normal user
        TOMOYO: Fix unused kernel config option.
        Smack: fix: invalid length set for the result of /smack/access
        Smack: compilation fix
        Smack: fix for /smack/access output, use string instead of byte
        Smack: domain transition protections (v3)
        Smack: Provide information for UDS getsockopt(SO_PEERCRED)
        Smack: Clean up comments
        Smack: Repair processing of fcntl
        Smack: Rule list lookup performance
        Smack: check permissions from user space (v2)
        TOMOYO: Fix quota and garbage collector.
        TOMOYO: Remove redundant tasklist_lock.
        TOMOYO: Fix domain transition failure warning.
        TOMOYO: Remove tomoyo_policy_memory_lock spinlock.
        TOMOYO: Simplify garbage collector.
        TOMOYO: Fix make namespacecheck warnings.
        target: check hex2bin result
        encrypted-keys: check hex2bin result
        ...
      36b8d186
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · cd85b557
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Finally remove leftover markers sections
        m68k/mac: Fix mac_irq_pending() for PSC MACE and SCC
        m68k/mac: Fix compiler warning in via_read_time()
        zorro: Fix four checkpatch warnings
      cd85b557
    • R
      Merge branch 'misc' into for-linus · bdf4e948
      Russell King 提交于
      Conflicts:
      	arch/arm/mach-integrator/integrator_ap.c
      bdf4e948
    • L
      Merge branches 'stable/drivers-3.2', 'stable/drivers.bugfixes-3.2' and... · 04a87524
      Linus Torvalds 提交于
      Merge branches 'stable/drivers-3.2', 'stable/drivers.bugfixes-3.2' and 'stable/pci.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      * 'stable/drivers-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xenbus: don't rely on xen_initial_domain to detect local xenstore
        xenbus: Fix loopback event channel assuming domain 0
        xen/pv-on-hvm:kexec: Fix implicit declaration of function 'xen_hvm_domain'
        xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel
        xen/pv-on-hvm kexec: update xs_wire.h:xsd_sockmsg_type from xen-unstable
        xen/pv-on-hvm kexec+kdump: reset PV devices in kexec or crash kernel
        xen/pv-on-hvm kexec: rebind virqs to existing eventchannel ports
        xen/pv-on-hvm kexec: prevent crash in xenwatch_thread() when stale watch events arrive
      
      * 'stable/drivers.bugfixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/pciback: Check if the device is found instead of blindly assuming so.
        xen/pciback: Do not dereference psdev during printk when it is NULL.
        xen: remove XEN_PLATFORM_PCI config option
        xen: XEN_PVHVM depends on PCI
        xen/pciback: double lock typo
        xen/pciback: use mutex rather than spinlock in vpci backend
        xen/pciback: Use mutexes when working with Xenbus state transitions.
        xen/pciback: miscellaneous adjustments
        xen/pciback: use mutex rather than spinlock in passthrough backend
        xen/pciback: use resource_size()
      
      * 'stable/pci.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/pci: support multi-segment systems
        xen-swiotlb: When doing coherent alloc/dealloc check before swizzling the MFNs.
        xen/pci: make bus notifier handler return sane values
        xen-swiotlb: fix printk and panic args
        xen-swiotlb: Fix wrong panic.
        xen-swiotlb: Retry up three times to allocate Xen-SWIOTLB
        xen-pcifront: Update warning comment to use 'e820_host' option.
      04a87524
    • R
      Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0',... · 06afb1a0
      Russell King 提交于
      Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v', 'pgt' (early part) and 'smp' into for-linus
      06afb1a0
    • L
      Merge branches 'stable/bug.fixes-3.2' and 'stable/mmu.fixes' of... · 31018acd
      Linus Torvalds 提交于
      Merge branches 'stable/bug.fixes-3.2' and 'stable/mmu.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      * 'stable/bug.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/p2m/debugfs: Make type_name more obvious.
        xen/p2m/debugfs: Fix potential pointer exception.
        xen/enlighten: Fix compile warnings and set cx to known value.
        xen/xenbus: Remove the unnecessary check.
        xen/irq: If we fail during msi_capability_init return proper error code.
        xen/events: Don't check the info for NULL as it is already done.
        xen/events: BUG() when we can't allocate our event->irq array.
      
      * 'stable/mmu.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: Fix selfballooning and ensure it doesn't go too far
        xen/gntdev: Fix sleep-inside-spinlock
        xen: modify kernel mappings corresponding to granted pages
        xen: add an "highmem" parameter to alloc_xenballooned_pages
        xen/p2m: Use SetPagePrivate and its friends for M2P overrides.
        xen/p2m: Make debug/xen/mmu/p2m visible again.
        Revert "xen/debug: WARN_ON when identity PFN has no _PAGE_IOMAP flag set."
      31018acd
    • L
      Merge branch 'stable/e820-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · 5eef150c
      Linus Torvalds 提交于
      * 'stable/e820-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: release all pages within 1-1 p2m mappings
        xen: allow extra memory to be in multiple regions
        xen: allow balloon driver to use more than one memory region
        xen/balloon: simplify test for the end of usable RAM
        xen/balloon: account for pages released during memory setup
      5eef150c
    • J
      x86: Fix compilation bug in kprobes' twobyte_is_boostable · 315eb8a2
      Josh Stone 提交于
      When compiling an i386_defconfig kernel with gcc-4.6.1-9.fc15.i686, I
      noticed a warning about the asm operand for test_bit in kprobes'
      can_boost.  I discovered that this caused only the first long of
      twobyte_is_boostable[] to be output.
      
      Jakub filed and fixed gcc PR50571 to correct the warning and this output
      issue.  But to solve it for less current gcc, we can make kprobes'
      twobyte_is_boostable[] non-const, and it won't be optimized out.
      
      Before:
      
          CC      arch/x86/kernel/kprobes.o
        In file included from include/linux/bitops.h:22:0,
                         from include/linux/kernel.h:17,
                         from [...]/arch/x86/include/asm/percpu.h:44,
                         from [...]/arch/x86/include/asm/current.h:5,
                         from [...]/arch/x86/include/asm/processor.h:15,
                         from [...]/arch/x86/include/asm/atomic.h:6,
                         from include/linux/atomic.h:4,
                         from include/linux/mutex.h:18,
                         from include/linux/notifier.h:13,
                         from include/linux/kprobes.h:34,
                         from arch/x86/kernel/kprobes.c:43:
        [...]/arch/x86/include/asm/bitops.h: In function ‘can_boost.part.1’:
        [...]/arch/x86/include/asm/bitops.h:319:2: warning: use of memory input
              without lvalue in asm operand 1 is deprecated [enabled by default]
      
        $ objdump -rd arch/x86/kernel/kprobes.o | grep -A1 -w bt
             551:	0f a3 05 00 00 00 00 	bt     %eax,0x0
                                554: R_386_32	.rodata.cst4
      
        $ objdump -s -j .rodata.cst4 -j .data arch/x86/kernel/kprobes.o
      
        arch/x86/kernel/kprobes.o:     file format elf32-i386
      
        Contents of section .data:
         0000 48000000 00000000 00000000 00000000  H...............
        Contents of section .rodata.cst4:
         0000 4c030000                             L...
      
      Only a single long of twobyte_is_boostable[] is in the object file.
      
      After, without the const on twobyte_is_boostable:
      
        $ objdump -rd arch/x86/kernel/kprobes.o | grep -A1 -w bt
             551:	0f a3 05 20 00 00 00 	bt     %eax,0x20
                                554: R_386_32	.data
      
        $ objdump -s -j .rodata.cst4 -j .data arch/x86/kernel/kprobes.o
      
        arch/x86/kernel/kprobes.o:     file format elf32-i386
      
        Contents of section .data:
         0000 48000000 00000000 00000000 00000000  H...............
         0010 00000000 00000000 00000000 00000000  ................
         0020 4c030000 0f000200 ffff0000 ffcff0c0  L...............
         0030 0000ffff 3bbbfff8 03ff2ebb 26bb2e77  ....;.......&..w
      
      Now all 32 bytes are output into .data instead.
      Signed-off-by: NJosh Stone <jistone@redhat.com>
      Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
      Cc: Jakub Jelinek <jakub@redhat.com>
      Cc: stable@kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      315eb8a2
    • N
      target: Fix compile warning w/ missing module.h include · b91bf5bf
      Nicholas Bellinger 提交于
      This patch fixes the following compile warning in target_core_cdb.c in
      recent linux-next code due to the new use of EXPORT_SYMBOL() for
      target_get_task_cdb().
      
      drivers/target/target_core_cdb.c:1316: warning: data definition has no type or storage class
      drivers/target/target_core_cdb.c:1316: warning: type defaults to ‘int’ in declaration of ‘EXPORT_SYMBOL’
      drivers/target/target_core_cdb.c:1316: warning: parameter names (without types) in function declaration
      
      Cc: Christoph Hellwig <hch@lst.de>
      Signed-off-by: NNicholas Bellinger <nab@linux-iscsi.org>
      b91bf5bf
    • R
      dp83640: free packet queues on remove · 8b3408f8
      Richard Cochran 提交于
      If the PHY should disappear (for example, on an USB Ethernet MAC), then
      the driver would leak any undelivered time stamp packets. This commit
      fixes the issue by calling the appropriate functions to free any packets
      left in the transmit and receive queues.
      
      The driver first appeared in v3.0.
      Signed-off-by: NRichard Cochran <richard.cochran@omicron.at>
      Acked-by: NEric Dumazet <eric.dumazet@gmail.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8b3408f8
    • R
      dp83640: use proper function to free transmit time stamping packets · f5ff7cd1
      Richard Cochran 提交于
      The previous commit enforces a new rule for handling the cloned packets
      for transmit time stamping. These packets must not be freed using any other
      function than skb_complete_tx_timestamp. This commit fixes the one and only
      driver using this API.
      
      The driver first appeared in v3.0.
      Signed-off-by: NRichard Cochran <richard.cochran@omicron.at>
      Acked-by: NEric Dumazet <eric.dumazet@gmail.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f5ff7cd1
    • A
      ipv6: Do not use routes from locally generated RAs · 9f56220f
      Andreas Hofmeister 提交于
      When hybrid mode is enabled (accept_ra == 2), the kernel also sees RAs
      generated locally. This is useful since it allows the kernel to auto-configure
      its own interface addresses.
      
      However, if 'accept_ra_defrtr' and/or 'accept_ra_rtr_pref' are set and the
      locally generated RAs announce the default route and/or other route information,
      the kernel happily inserts bogus routes with its own address as gateway.
      
      With this patch, adding routes from an RA will be skiped when the RAs source
      address matches any local address, just as if 'accept_ra_defrtr' and
      'accept_ra_rtr_pref' were set to 0.
      Signed-off-by: NAndreas Hofmeister <andi@collax.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9f56220f
    • E
      |PATCH net-next] tg3: add tx_dropped counter · 48855432
      Eric Dumazet 提交于
      If a frame cant be transmitted, it is silently discarded.
      
      Add a counter to report these errors to user.
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      48855432
    • S
      be2net: don't create multiple RX/TX rings in multi channel mode · 752961a1
      Sathya Perla 提交于
      When the HW is in multi-channel mode based on the skew/IPL, there are
      4 functions per port and so not enough resources to create multiple
      RX/TX rings for each function.
      Signed-off-by: NSuresh Reddy <suresh.reddy@emulex.com>
      Signed-off-by: NSathya Perla <sathya.perla@emulex.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      752961a1
    • S
      be2net: don't create multiple TXQs in BE2 · dafc0fe3
      Sathya Perla 提交于
      Multiple TXQ support is partially broken in BE2. It is fully
      supported BE3 onwards and in Lancer.
      Signed-off-by: NVasundhara Volam <vasundhara.volam@emulex.com>
      Signed-off-by: NSathya Perla <sathya.perla@emulex.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      dafc0fe3
    • S
      be2net: refactor VF setup/teardown code into be_vf_setup/clear() · f9449ab7
      Sathya Perla 提交于
      Currently the code for VF setup/teardown done by a PF (if_create,
      mac_add_config, link_status_query etc) is scattered; this patch
      refactors this code into be_vf_setup() and be_vf_clear().  The
      if_create/if_destroy/mac_addr_query cmds are now called after the MCCQ
      is created; so these cmds are now modified to use the MCCQ instead of
      MBOX.
      Signed-off-by: NSathya Perla <sathya.perla@emulex.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f9449ab7
    • S
      be2net: add vlan/rx-mode/flow-control config to be_setup() · a54769f5
      Sathya Perla 提交于
      When a card is reset due to EEH error recovery or due to a suspend,
      rx-mode config (promisc/mc) is not being sent to the FW. be_setup() is
      called in these flows and is the best place for such config/re-config
      cmds. Hence include rx-mode, vlan and flow-control config in
      be_setup().
      Signed-off-by: NSathya Perla <sathya.perla@emulex.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a54769f5
    • E
      net_sched: cls_flow: use skb_header_pointer() · 859c2012
      Eric Dumazet 提交于
      Dan Siemon would like to add tunnelling support to cls_flow
      
      This preliminary patch introduces use of skb_header_pointer() to help
      this task, while avoiding skb head reallocation because of deep packet
      inspection.
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      859c2012
    • G
      ipv4: avoid useless call of the function check_peer_pmtu · 59445b6b
      Gao feng 提交于
      In func ipv4_dst_check,check_peer_pmtu should be called only when peer is updated.
      So,if the peer is not updated in ip_rt_frag_needed,we can not inc __rt_peer_genid.
      Signed-off-by: NGao feng <gaofeng@cn.fujitsu.com>
      Acked-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      59445b6b
    • D
    • F
      TCP: remove TCP_DEBUG · 78d81d15
      Flavio Leitner 提交于
      It was enabled by default and the messages guarded
      by the define are useful.
      Signed-off-by: NFlavio Leitner <fbl@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      78d81d15
    • D
      net: Fix driver name for mdio-gpio.c · f42af6c4
      Dirk Eibach 提交于
      Since commit
      "74888760... dt/net: Eliminate users of of_platform_{,un}register_driver"
      there are two platform drivers named "mdio-gpio" registered.
      I renamed the of variant to "mdio-ofgpio".
      Signed-off-by: NDirk Eibach <eibach@gdsys.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f42af6c4
    • K
      m68k: Finally remove leftover markers sections · bc74ee97
      Kirill Tkhai 提交于
      Markers have removed already twice:
      
      1: fc537766
      2: eb878b3b
      
      But a little bit is still here.
      Signed-off-by: NTkhai Kirill <tkhai@yandex.ru>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      bc74ee97
    • F
      m68k/mac: Fix mac_irq_pending() for PSC MACE and SCC · 8b223432
      Finn Thain 提交于
      Add missing return statement. The docs say that the level 4 PSC IRQs
      relate to MACE DMA and SCC. Since those drivers don't call
      mac_irq_pending() this patch has no affect. But it should be fixed all the
      same, since it can be useful for MACE debugging.
      Signed-off-by: NFinn Thain <fthain@telegraphics.com.au>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      8b223432
    • F
      m68k/mac: Fix compiler warning in via_read_time() · 75a23850
      Finn Thain 提交于
      The algorithm described in the comment compares two reads from the RTC but
      the code actually reads once and compares the result to an uninitialized
      value. This causes the compiler to warn, "last_result maybe used
      uninitialized". Make the code match the comment, fix the warning and
      perhaps improve reliability. Tested on a Quadra 700.
      Signed-off-by: NFinn Thain <fthain@telegraphics.com.au>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      75a23850
    • J
      zorro: Fix four checkpatch warnings · d996e9dc
      Jim Rotmalm 提交于
      zorro-driver.c: fix four checkpatch warnings of:
      WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
      
      I had a cat. The cat was mine.
      His name was Zorro. Amiga is fine.
      Signed-off-by: NJim Rotmalm <jim.rotmalm@gmail.com>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      d996e9dc