Merge branch 'for-john' of git://x-git.kernel.org/pub/scm/linux/kernel/git/jberg...

[cascardo/linux.git] / net / bridge / br_fdb.c

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 8117900..b0812c9 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -181,9 +181,9 @@ void br_fdb_cleanup(unsigned long _data)
        spin_lock(&br->hash_lock);
        for (i = 0; i < BR_HASH_SIZE; i++) {
                struct net_bridge_fdb_entry *f;
-               struct hlist_node *h, *n;
+               struct hlist_node *n;
 
-               hlist_for_each_entry_safe(f, h, n, &br->hash[i], hlist) {
+               hlist_for_each_entry_safe(f, n, &br->hash[i], hlist) {
                        unsigned long this_timer;
                        if (f->is_static)
                                continue;
@@ -207,8 +207,8 @@ void br_fdb_flush(struct net_bridge *br)
        spin_lock_bh(&br->hash_lock);
        for (i = 0; i < BR_HASH_SIZE; i++) {
                struct net_bridge_fdb_entry *f;
-               struct hlist_node *h, *n;
-               hlist_for_each_entry_safe(f, h, n, &br->hash[i], hlist) {
+               struct hlist_node *n;
+               hlist_for_each_entry_safe(f, n, &br->hash[i], hlist) {
                        if (!f->is_static)
                                fdb_delete(br, f);
                }
@@ -266,10 +266,9 @@ struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br,
                                          const unsigned char *addr,
                                          __u16 vid)
 {
-       struct hlist_node *h;
        struct net_bridge_fdb_entry *fdb;
 
-       hlist_for_each_entry_rcu(fdb, h,
+       hlist_for_each_entry_rcu(fdb,
                                &br->hash[br_mac_hash(addr, vid)], hlist) {
                if (ether_addr_equal(fdb->addr.addr, addr) &&
                    fdb->vlan_id == vid) {
@@ -315,14 +314,13 @@ int br_fdb_fillbuf(struct net_bridge *br, void *buf,
 {
        struct __fdb_entry *fe = buf;
        int i, num = 0;
-       struct hlist_node *h;
        struct net_bridge_fdb_entry *f;
 
        memset(buf, 0, maxnum*sizeof(struct __fdb_entry));
 
        rcu_read_lock();
        for (i = 0; i < BR_HASH_SIZE; i++) {
-               hlist_for_each_entry_rcu(f, h, &br->hash[i], hlist) {
+               hlist_for_each_entry_rcu(f, &br->hash[i], hlist) {
                        if (num >= maxnum)
                                goto out;
 
@@ -363,10 +361,9 @@ static struct net_bridge_fdb_entry *fdb_find(struct hlist_head *head,
                                             const unsigned char *addr,
                                             __u16 vid)
 {
-       struct hlist_node *h;
        struct net_bridge_fdb_entry *fdb;
 
-       hlist_for_each_entry(fdb, h, head, hlist) {
+       hlist_for_each_entry(fdb, head, hlist) {
                if (ether_addr_equal(fdb->addr.addr, addr) &&
                    fdb->vlan_id == vid)
                        return fdb;
@@ -378,10 +375,9 @@ static struct net_bridge_fdb_entry *fdb_find_rcu(struct hlist_head *head,
                                                 const unsigned char *addr,
                                                 __u16 vid)
 {
-       struct hlist_node *h;
        struct net_bridge_fdb_entry *fdb;
 
-       hlist_for_each_entry_rcu(fdb, h, head, hlist) {
+       hlist_for_each_entry_rcu(fdb, head, hlist) {
                if (ether_addr_equal(fdb->addr.addr, addr) &&
                    fdb->vlan_id == vid)
                        return fdb;
@@ -593,10 +589,9 @@ int br_fdb_dump(struct sk_buff *skb,
                goto out;
 
        for (i = 0; i < BR_HASH_SIZE; i++) {
-               struct hlist_node *h;
                struct net_bridge_fdb_entry *f;
 
-               hlist_for_each_entry_rcu(f, h, &br->hash[i], hlist) {
+               hlist_for_each_entry_rcu(f, &br->hash[i], hlist) {
                        if (idx < cb->args[0])
                                goto skip;