From 15b031f5148311489b8224caae79dfe973c7c9d9 Mon Sep 17 00:00:00 2001 From: Ivo van Doorn Date: Tue, 29 Jun 2010 21:49:05 +0200 Subject: [PATCH] --- yaml --- r: 203331 b: refs/heads/master c: e22557f2e3bdf0b56c2592c9aeb50f17945f71b0 h: refs/heads/master i: 203329: 800612bebd3e257d01fed71c29caaeee8280ed2f 203327: 323f60d7c39e46ff9864c787928fe6ccbdfdddfa v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2800lib.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4ed83271e77d..680263efe0ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa674631efabfb21f573137da9b84ff905ba66d8 +refs/heads/master: e22557f2e3bdf0b56c2592c9aeb50f17945f71b0 diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c index 2d0a2168e310..0cf7796cdff5 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c @@ -836,14 +836,12 @@ void rt2800_config_ant(struct rt2x00_dev *rt2x00dev, struct antenna_setup *ant) switch ((int)ant->tx) { case 1: rt2x00_set_field8(&r1, BBP1_TX_ANTENNA, 0); - if (rt2x00_is_pci(rt2x00dev) || rt2x00_is_soc(rt2x00dev)) - rt2x00_set_field8(&r3, BBP3_RX_ANTENNA, 0); break; case 2: rt2x00_set_field8(&r1, BBP1_TX_ANTENNA, 2); break; case 3: - /* Do nothing */ + rt2x00_set_field8(&r1, BBP1_TX_ANTENNA, 0); break; }