2011-12-07 11:35:22

by Johannes Berg

Subject: [PATCH] mac80211_hwsim: fix wmediumd_pid

From: Johannes Berg <[email protected]>

Fix a few minor issues with wmediumd_pid:
a) make static
b) use u32 to match the snd_pid type
c) use ACCESS_ONCE since we don't lock it
d) don't explicitly initialize to 0

Signed-off-by: Johannes Berg <[email protected]>
---
drivers/net/wireless/mac80211_hwsim.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)

--- a/drivers/net/wireless/mac80211_hwsim.c 2011-12-07 09:11:40.000000000 +0100
+++ b/drivers/net/wireless/mac80211_hwsim.c 2011-12-07 12:32:26.000000000 +0100
@@ -37,7 +37,8 @@ MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("Software simulator of 802.11 radio(s) for mac80211");
MODULE_LICENSE("GPL");

-int wmediumd_pid;
+static u32 wmediumd_pid;
+
static int radios = 2;
module_param(radios, int, 0444);
MODULE_PARM_DESC(radios, "Number of simulated radios");
@@ -665,7 +666,7 @@ static void mac80211_hwsim_tx(struct iee
{
bool ack;
struct ieee80211_tx_info *txi;
- int _pid;
+ u32 _pid;

mac80211_hwsim_monitor_rx(hw, skb);

@@ -676,7 +677,7 @@ static void mac80211_hwsim_tx(struct iee
}

/* wmediumd mode check */
- _pid = wmediumd_pid;
+ _pid = ACCESS_ONCE(wmediumd_pid);

if (_pid)
return mac80211_hwsim_tx_frame_nl(hw, skb, _pid);
@@ -764,7 +765,7 @@ static void mac80211_hwsim_beacon_tx(voi
struct ieee80211_hw *hw = arg;
struct sk_buff *skb;
struct ieee80211_tx_info *info;
- int _pid;
+ u32 _pid;

hwsim_check_magic(vif);

@@ -781,7 +782,7 @@ static void mac80211_hwsim_beacon_tx(voi
mac80211_hwsim_monitor_rx(hw, skb);

/* wmediumd mode check */
- _pid = wmediumd_pid;
+ _pid = ACCESS_ONCE(wmediumd_pid);

if (_pid)
return mac80211_hwsim_tx_frame_nl(hw, skb, _pid);
@@ -1254,7 +1255,7 @@ static void hwsim_send_ps_poll(void *dat
struct hwsim_vif_priv *vp = (void *)vif->drv_priv;
struct sk_buff *skb;
struct ieee80211_pspoll *pspoll;
- int _pid;
+ u32 _pid;

if (!vp->assoc)
return;
@@ -1275,7 +1276,7 @@ static void hwsim_send_ps_poll(void *dat
memcpy(pspoll->ta, mac, ETH_ALEN);

/* wmediumd mode check */
- _pid = wmediumd_pid;
+ _pid = ACCESS_ONCE(wmediumd_pid);

if (_pid)
return mac80211_hwsim_tx_frame_nl(data->hw, skb, _pid);
@@ -1292,7 +1293,7 @@ static void hwsim_send_nullfunc(struct m
struct hwsim_vif_priv *vp = (void *)vif->drv_priv;
struct sk_buff *skb;
struct ieee80211_hdr *hdr;
- int _pid;
+ u32 _pid;

if (!vp->assoc)
return;
@@ -1314,7 +1315,7 @@ static void hwsim_send_nullfunc(struct m
memcpy(hdr->addr3, vp->bssid, ETH_ALEN);

/* wmediumd mode check */
- _pid = wmediumd_pid;
+ _pid = ACCESS_ONCE(wmediumd_pid);

if (_pid)
return mac80211_hwsim_tx_frame_nl(data->hw, skb, _pid);
@@ -1634,8 +1635,6 @@ static int hwsim_init_netlink(void)
int rc;
printk(KERN_INFO "mac80211_hwsim: initializing netlink\n");

- wmediumd_pid = 0;
-
rc = genl_register_family_with_ops(&hwsim_genl_family,
hwsim_ops, ARRAY_SIZE(hwsim_ops));
if (rc)

2011-12-07 18:18:03

by Javier López

Subject: Re: [PATCH] mac80211_hwsim: fix wmediumd_pid

Hi all,

I agree with all the proposed changes.

Thanks Johannes

Cheers,

On Wed, Dec 7, 2011 at 3:35 AM, Johannes Berg <[email protected]> wrote:
>
> From: Johannes Berg <[email protected]>
>
> Fix a few minor issues with wmediumd_pid:
> a) make static
> b) use u32 to match the snd_pid type
> c) use ACCESS_ONCE since we don't lock it
> d) don't explicitly initialize to 0
>
> Signed-off-by: Johannes Berg <[email protected]>
> ---
> ?drivers/net/wireless/mac80211_hwsim.c | ? 21 ++++++++++-----------
> ?1 file changed, 10 insertions(+), 11 deletions(-)
>
> --- a/drivers/net/wireless/mac80211_hwsim.c ? ? 2011-12-07 09:11:40.000000000 +0100
> +++ b/drivers/net/wireless/mac80211_hwsim.c ? ? 2011-12-07 12:32:26.000000000 +0100
> @@ -37,7 +37,8 @@ MODULE_AUTHOR("Jouni Malinen");
> ?MODULE_DESCRIPTION("Software simulator of 802.11 radio(s) for mac80211");
> ?MODULE_LICENSE("GPL");
>
> -int wmediumd_pid;
> +static u32 wmediumd_pid;
> +
> ?static int radios = 2;
> ?module_param(radios, int, 0444);
> ?MODULE_PARM_DESC(radios, "Number of simulated radios");
> @@ -665,7 +666,7 @@ static void mac80211_hwsim_tx(struct iee
> ?{
> ? ? ? ?bool ack;
> ? ? ? ?struct ieee80211_tx_info *txi;
> - ? ? ? int _pid;
> + ? ? ? u32 _pid;
>
> ? ? ? ?mac80211_hwsim_monitor_rx(hw, skb);
>
> @@ -676,7 +677,7 @@ static void mac80211_hwsim_tx(struct iee
> ? ? ? ?}
>
> ? ? ? ?/* wmediumd mode check */
> - ? ? ? _pid = wmediumd_pid;
> + ? ? ? _pid = ACCESS_ONCE(wmediumd_pid);
>
> ? ? ? ?if (_pid)
> ? ? ? ? ? ? ? ?return mac80211_hwsim_tx_frame_nl(hw, skb, _pid);
> @@ -764,7 +765,7 @@ static void mac80211_hwsim_beacon_tx(voi
> ? ? ? ?struct ieee80211_hw *hw = arg;
> ? ? ? ?struct sk_buff *skb;
> ? ? ? ?struct ieee80211_tx_info *info;
> - ? ? ? int _pid;
> + ? ? ? u32 _pid;
>
> ? ? ? ?hwsim_check_magic(vif);
>
> @@ -781,7 +782,7 @@ static void mac80211_hwsim_beacon_tx(voi
> ? ? ? ?mac80211_hwsim_monitor_rx(hw, skb);
>
> ? ? ? ?/* wmediumd mode check */
> - ? ? ? _pid = wmediumd_pid;
> + ? ? ? _pid = ACCESS_ONCE(wmediumd_pid);
>
> ? ? ? ?if (_pid)
> ? ? ? ? ? ? ? ?return mac80211_hwsim_tx_frame_nl(hw, skb, _pid);
> @@ -1254,7 +1255,7 @@ static void hwsim_send_ps_poll(void *dat
> ? ? ? ?struct hwsim_vif_priv *vp = (void *)vif->drv_priv;
> ? ? ? ?struct sk_buff *skb;
> ? ? ? ?struct ieee80211_pspoll *pspoll;
> - ? ? ? int _pid;
> + ? ? ? u32 _pid;
>
> ? ? ? ?if (!vp->assoc)
> ? ? ? ? ? ? ? ?return;
> @@ -1275,7 +1276,7 @@ static void hwsim_send_ps_poll(void *dat
> ? ? ? ?memcpy(pspoll->ta, mac, ETH_ALEN);
>
> ? ? ? ?/* wmediumd mode check */
> - ? ? ? _pid = wmediumd_pid;
> + ? ? ? _pid = ACCESS_ONCE(wmediumd_pid);
>
> ? ? ? ?if (_pid)
> ? ? ? ? ? ? ? ?return mac80211_hwsim_tx_frame_nl(data->hw, skb, _pid);
> @@ -1292,7 +1293,7 @@ static void hwsim_send_nullfunc(struct m
> ? ? ? ?struct hwsim_vif_priv *vp = (void *)vif->drv_priv;
> ? ? ? ?struct sk_buff *skb;
> ? ? ? ?struct ieee80211_hdr *hdr;
> - ? ? ? int _pid;
> + ? ? ? u32 _pid;
>
> ? ? ? ?if (!vp->assoc)
> ? ? ? ? ? ? ? ?return;
> @@ -1314,7 +1315,7 @@ static void hwsim_send_nullfunc(struct m
> ? ? ? ?memcpy(hdr->addr3, vp->bssid, ETH_ALEN);
>
> ? ? ? ?/* wmediumd mode check */
> - ? ? ? _pid = wmediumd_pid;
> + ? ? ? _pid = ACCESS_ONCE(wmediumd_pid);
>
> ? ? ? ?if (_pid)
> ? ? ? ? ? ? ? ?return mac80211_hwsim_tx_frame_nl(data->hw, skb, _pid);
> @@ -1634,8 +1635,6 @@ static int hwsim_init_netlink(void)
> ? ? ? ?int rc;
> ? ? ? ?printk(KERN_INFO "mac80211_hwsim: initializing netlink\n");
>
> - ? ? ? wmediumd_pid = 0;
> -
> ? ? ? ?rc = genl_register_family_with_ops(&hwsim_genl_family,
> ? ? ? ? ? ? ? ?hwsim_ops, ARRAY_SIZE(hwsim_ops));
> ? ? ? ?if (rc)
>
>



--
Javier L?pez