From d749edd4bafd31028ddc7ad541d85b24f23ddcf6 Mon Sep 17 00:00:00 2001 From: Hannes Eder Date: Sun, 15 Feb 2009 02:13:01 +0000 Subject: [PATCH] --- yaml --- r: 134624 b: refs/heads/master c: ad7bf428328d360b54e0d5f5fc7a9c0a6cf3b7fe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tokenring/smctr.c | 10 ---------- trunk/drivers/net/tokenring/smctr.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/[refs] b/[refs] index e855e3f6c2f3..4461aab85eef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f50ca07fffdfa8f74ff62e54bf569c745e906e5 +refs/heads/master: ad7bf428328d360b54e0d5f5fc7a9c0a6cf3b7fe diff --git a/trunk/drivers/net/tokenring/smctr.c b/trunk/drivers/net/tokenring/smctr.c index a8a5b4c4bd4d..9d7db2c8d661 100644 --- a/trunk/drivers/net/tokenring/smctr.c +++ b/trunk/drivers/net/tokenring/smctr.c @@ -4393,52 +4393,42 @@ static int smctr_ring_status_chg(struct net_device *dev) { case RING_RECOVERY: printk(KERN_INFO "%s: Ring Recovery\n", dev->name); - tp->current_ring_status |= RING_RECOVERY; break; case SINGLE_STATION: printk(KERN_INFO "%s: Single Statinon\n", dev->name); - tp->current_ring_status |= SINGLE_STATION; break; case COUNTER_OVERFLOW: printk(KERN_INFO "%s: Counter Overflow\n", dev->name); - tp->current_ring_status |= COUNTER_OVERFLOW; break; case REMOVE_RECEIVED: printk(KERN_INFO "%s: Remove Received\n", dev->name); - tp->current_ring_status |= REMOVE_RECEIVED; break; case AUTO_REMOVAL_ERROR: printk(KERN_INFO "%s: Auto Remove Error\n", dev->name); - tp->current_ring_status |= AUTO_REMOVAL_ERROR; break; case LOBE_WIRE_FAULT: printk(KERN_INFO "%s: Lobe Wire Fault\n", dev->name); - tp->current_ring_status |= LOBE_WIRE_FAULT; break; case TRANSMIT_BEACON: printk(KERN_INFO "%s: Transmit Beacon\n", dev->name); - tp->current_ring_status |= TRANSMIT_BEACON; break; case SOFT_ERROR: printk(KERN_INFO "%s: Soft Error\n", dev->name); - tp->current_ring_status |= SOFT_ERROR; break; case HARD_ERROR: printk(KERN_INFO "%s: Hard Error\n", dev->name); - tp->current_ring_status |= HARD_ERROR; break; case SIGNAL_LOSS: printk(KERN_INFO "%s: Signal Loss\n", dev->name); - tp->current_ring_status |= SIGNAL_LOSS; break; default: diff --git a/trunk/drivers/net/tokenring/smctr.h b/trunk/drivers/net/tokenring/smctr.h index 52df7dd815cc..6e5700ab4fc3 100644 --- a/trunk/drivers/net/tokenring/smctr.h +++ b/trunk/drivers/net/tokenring/smctr.h @@ -977,7 +977,6 @@ typedef struct net_local { __u8 monitor_state_ready; __u16 ring_status; __u8 ring_status_flags; - __u8 current_ring_status; __u8 state; __u8 join_state;