Eric Lee / smarc-ti-linux-kernel

20 Jun, 2013

1 commit

  • d98cae64e   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Browse Code »

    Conflicts:
    drivers/net/wireless/ath/ath9k/Kconfig
    drivers/net/xen-netback/netback.c
    net/batman-adv/bat_iv_ogm.c
    net/wireless/nl80211.c

    The ath9k Kconfig conflict was a change of a Kconfig option name right
    next to the deletion of another option.

    The xen-netback conflict was overlapping changes involving the
    handling of the notify list in xen_netbk_rx_action().

    Batman conflict resolution provided by Antonio Quartulli, basically
    keep everything in both conflict hunks.

    The nl80211 conflict is a little more involved. In 'net' we added a
    dynamic memory allocation to nl80211_dump_wiphy() to fix a race that
    Linus reported. Meanwhile in 'net-next' the handlers were converted
    to use pre and post doit handlers which use a flag to determine
    whether to hold the RTNL mutex around the operation.

    However, the dump handlers to not use this logic. Instead they have
    to explicitly do the locking. There were apparent bugs in the
    conversion of nl80211_dump_wiphy() in that we were not dropping the
    RTNL mutex in all the return paths, and it seems we very much should
    be doing so. So I fixed that whilst handling the overlapping changes.

    To simplify the initial returns, I take the RTNL mutex after we try
    to allocate 'tb'.

    Signed-off-by: David S. Miller

    David S. Miller
     

12 Jun, 2013

2 commits

07 Mar, 2013

2 commits

20 Aug, 2012

1 commit

18 Jul, 2012

1 commit

12 Jul, 2012

1 commit

20 Jun, 2012

2 commits

22 Apr, 2012

1 commit

  • 19a0b58e5   team: allow to enable/disable ports ... Browse Code »

    This patch changes content of hashlist (used to get port struct by
    computed index (0...en_port_count-1)). Now the hash list contains only
    enabled ports so userspace will be able to say what ports can be used
    for tx/rx. This becomes handy when userspace will need to disable ports
    which does not belong to active aggregator. By default, newly added port
    is enabled.

    Signed-off-by: Jiri Pirko
    Signed-off-by: David S. Miller

    Jiri Pirko
     

14 Nov, 2011

1 commit

  • 3d249d4ca   net: introduce ethernet teaming device ... Browse Code »
    81

    This patch introduces new network device called team. It supposes to be
    very fast, simple, userspace-driven alternative to existing bonding
    driver.

    Userspace library called libteam with couple of demo apps is available
    here:
    https://github.com/jpirko/libteam
    Note it's still in its dipers atm.

    teamlibteam use generic netlink for communication. That and rtnl
    suppose to be the only way to configure team device, no sysfs etc.

    Python binding of libteam was recently introduced.
    Daemon providing arpmon/miimon active-backup functionality will be
    introduced shortly. All what's necessary is already implemented in
    kernel team driver.

    v7->v8:
    - check ndo_ndo_vlan_rx_[add/kill]_vid functions before calling
    them.
    - use dev_kfree_skb_any() instead of dev_kfree_skb()

    v6->v7:
    - transmit and receive functions are not checked in hot paths.
    That also resolves memory leak on transmit when no port is
    present

    v5->v6:
    - changed couple of _rcu calls to non _rcu ones in non-readers

    v4->v5:
    - team_change_mtu() uses team->lock while travesing though port
    list
    - mac address changes are moved completely to jurisdiction of
    userspace daemon. This way the daemon can do FOM1, FOM2 and
    possibly other weird things with mac addresses.
    Only round-robin mode sets up all ports to bond's address then
    enslaved.
    - Extended Kconfig text

    v3->v4:
    - remove redundant synchronize_rcu from __team_change_mode()
    - revert "set and clear of mode_ops happens per pointer, not per
    byte"
    - extend comment of function __team_change_mode()

    v2->v3:
    - team_change_mtu() uses rcu version of list traversal to unwind
    - set and clear of mode_ops happens per pointer, not per byte
    - port hashlist changed to be embedded into team structure
    - error branch in team_port_enter() does cleanup now
    - fixed rtln->rtnl

    v1->v2:
    - modes are made as modules. Makes team more modular and
    extendable.
    - several commenters' nitpicks found on v1 were fixed
    - several other bugs were fixed.
    - note I ignored Eric's comment about roundrobin port selector
    as Eric's way may be easily implemented as another mode (mode
    "random") in future.

    Signed-off-by: Jiri Pirko
    Signed-off-by: David S. Miller

    Jiri Pirko