Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 298453
b: refs/heads/master
c: 09e79d6
h: refs/heads/master
i:
  298451: 36cd103
v: v3
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Mar 28, 2012
1 parent 65b1ea1 commit 80d1eac
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 819a100846295461bc0f1bfcb8e5ab11c1bc4cdb
refs/heads/master: 09e79d6ea65d66e0a5e9ba76865320e74832dc7c
7 changes: 4 additions & 3 deletions trunk/drivers/net/eql.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
#include <linux/if.h>
#include <linux/if_arp.h>
#include <linux/if_eql.h>
#include <linux/pkt_sched.h>

#include <asm/uaccess.h>

Expand All @@ -143,7 +144,7 @@ static void eql_timer(unsigned long param)
equalizer_t *eql = (equalizer_t *) param;
struct list_head *this, *tmp, *head;

spin_lock_bh(&eql->queue.lock);
spin_lock(&eql->queue.lock);
head = &eql->queue.all_slaves;
list_for_each_safe(this, tmp, head) {
slave_t *slave = list_entry(this, slave_t, list);
Expand All @@ -157,7 +158,7 @@ static void eql_timer(unsigned long param)
}

}
spin_unlock_bh(&eql->queue.lock);
spin_unlock(&eql->queue.lock);

eql->timer.expires = jiffies + EQL_DEFAULT_RESCHED_IVAL;
add_timer(&eql->timer);
Expand Down Expand Up @@ -341,7 +342,7 @@ static netdev_tx_t eql_slave_xmit(struct sk_buff *skb, struct net_device *dev)
struct net_device *slave_dev = slave->dev;

skb->dev = slave_dev;
skb->priority = 1;
skb->priority = TC_PRIO_FILLER;
slave->bytes_queued += skb->len;
dev_queue_xmit(skb);
dev->stats.tx_packets++;
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/linux/if_eql.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#define EQL_DEFAULT_SLAVE_PRIORITY 28800
#define EQL_DEFAULT_MAX_SLAVES 4
#define EQL_DEFAULT_MTU 576
#define EQL_DEFAULT_RESCHED_IVAL 100
#define EQL_DEFAULT_RESCHED_IVAL HZ

#define EQL_ENSLAVE (SIOCDEVPRIVATE)
#define EQL_EMANCIPATE (SIOCDEVPRIVATE + 1)
Expand Down

0 comments on commit 80d1eac

Please sign in to comment.