From 72430182d27c297762b8c2887625a061bc1ee929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Tue, 7 Dec 2010 09:42:06 +0100 Subject: [PATCH] --- yaml --- r: 225135 b: refs/heads/master c: 755fd183b89bc8a302669b6f35cd98faee473f7a h: refs/heads/master i: 225133: 128f7a012b2fd09cbee98791bb0ff64cbaa5978a 225131: a60e209e1fdd39f1ced700a3dfd353784a2849fd 225127: bf0fca8237d040beefac258a4d472d7aab75f8b7 225119: d6fe045c83c5cc3f573c4654420e8a7dfc9aec29 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/b43/phy_n.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 76c3c83a70bb..9818e1c82a87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f00fe7f6d14ab7bbd4655f55eae71bbd73ef766d +refs/heads/master: 755fd183b89bc8a302669b6f35cd98faee473f7a diff --git a/trunk/drivers/net/wireless/b43/phy_n.c b/trunk/drivers/net/wireless/b43/phy_n.c index 905f1d7bac20..f78f4e96defa 100644 --- a/trunk/drivers/net/wireless/b43/phy_n.c +++ b/trunk/drivers/net/wireless/b43/phy_n.c @@ -3705,6 +3705,15 @@ static void b43_nphy_op_write(struct b43_wldev *dev, u16 reg, u16 value) b43_write16(dev, B43_MMIO_PHY_DATA, value); } +static void b43_nphy_op_maskset(struct b43_wldev *dev, u16 reg, u16 mask, + u16 set) +{ + check_phyreg(dev, reg); + b43_write16(dev, B43_MMIO_PHY_CONTROL, reg); + b43_write16(dev, B43_MMIO_PHY_DATA, + (b43_read16(dev, B43_MMIO_PHY_DATA) & mask) | set); +} + static u16 b43_nphy_op_radio_read(struct b43_wldev *dev, u16 reg) { /* Register 1 is a 32-bit register. */ @@ -3799,6 +3808,7 @@ const struct b43_phy_operations b43_phyops_n = { .init = b43_nphy_op_init, .phy_read = b43_nphy_op_read, .phy_write = b43_nphy_op_write, + .phy_maskset = b43_nphy_op_maskset, .radio_read = b43_nphy_op_radio_read, .radio_write = b43_nphy_op_radio_write, .software_rfkill = b43_nphy_op_software_rfkill,