From 53c6c55324e78404526e57ebd90b9e12985720e4 Mon Sep 17 00:00:00 2001 From: Helmut Schaa Date: Thu, 6 May 2010 12:29:44 +0200 Subject: [PATCH] --- yaml --- r: 194983 b: refs/heads/master c: 809bfe81ce225d1f5a111840c3d9e30704d98478 h: refs/heads/master i: 194981: cb356b9533de0fe87fb7e94d3b67acdc8644ba99 194979: 80669875cab6af535692c39bbd69ed644067608d 194975: 8f629c1394f319fc759b341a507021fd9e78c010 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2800lib.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e6d22b97c643..147d6a9b6b39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a21c2ab4210a89a71a0a99685acf16ae126b2eee +refs/heads/master: 809bfe81ce225d1f5a111840c3d9e30704d98478 diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c index 11a0d8b6235d..b110368c00e0 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c @@ -639,8 +639,6 @@ void rt2800_config_erp(struct rt2x00_dev *rt2x00dev, struct rt2x00lib_erp *erp) rt2800_register_write(rt2x00dev, BKOFF_SLOT_CFG, reg); rt2800_register_read(rt2x00dev, XIFS_TIME_CFG, ®); - rt2x00_set_field32(®, XIFS_TIME_CFG_CCKM_SIFS_TIME, erp->sifs); - rt2x00_set_field32(®, XIFS_TIME_CFG_OFDM_SIFS_TIME, erp->sifs); rt2x00_set_field32(®, XIFS_TIME_CFG_EIFS, erp->eifs); rt2800_register_write(rt2x00dev, XIFS_TIME_CFG, reg);