Commit 8dd4372e authored by Bing Zhao's avatar Bing Zhao Committed by John W. Linville
Browse files

mwifiex: fix powerpc64-linux- compilation warnings 



These warnings can be detected by using powerpc64-linux toolchain
(gcc-4.6.3-nolibc).

  CC [M]  drivers/net/wireless/mwifiex/sta_event.o
drivers/net/wireless/mwifiex/sta_event.c: In function 'mwifiex_process_sta_event':
drivers/net/wireless/mwifiex/sta_event.c:388:4: warning: comparison of distinct pointer types lacks a cast [enabled by default]
  CC [M]  drivers/net/wireless/mwifiex/uap_event.o
drivers/net/wireless/mwifiex/uap_event.c: In function 'mwifiex_process_uap_event':
drivers/net/wireless/mwifiex/uap_event.c:258:11: warning: comparison of distinct pointer types lacks a cast [enabled by default]

Use min_t() instead of min() to fix the warnings.

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 450e9038

drivers/net/wireless/mwifiex/sta_event.c

+5 −4
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) 
	struct mwifiex_adapter *adapter = priv->adapter;

	int ret = 0;

	u32 eventcause = adapter->event_cause;

	u16 ctrl;



	switch (eventcause) {

	case EVENT_DUMMY_HOST_WAKEUP_SIGNAL:
@@ -382,11 +383,11 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) 
					      adapter->event_body);

		break;

	case EVENT_AMSDU_AGGR_CTRL:

		dev_dbg(adapter->dev, "event:  AMSDU_AGGR_CTRL %d\n",

			*(u16 *) adapter->event_body);

		ctrl = le16_to_cpu(*(__le16 *)adapter->event_body);

		dev_dbg(adapter->dev, "event: AMSDU_AGGR_CTRL %d\n", ctrl);



		adapter->tx_buf_size =

			min(adapter->curr_tx_buf_size,

			    le16_to_cpu(*(__le16 *) adapter->event_body));

				min_t(u16, adapter->curr_tx_buf_size, ctrl);

		dev_dbg(adapter->dev, "event: tx_buf_size %d\n",

			adapter->tx_buf_size);

		break;

drivers/net/wireless/mwifiex/uap_event.c

+4 −5
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ int mwifiex_process_uap_event(struct mwifiex_private *priv) 
	struct mwifiex_sta_node *node;

	u8 *deauth_mac;

	struct host_cmd_ds_11n_batimeout *ba_timeout;

	u16 ctrl;



	switch (eventcause) {

	case EVENT_UAP_STA_ASSOC:
@@ -250,14 +251,12 @@ int mwifiex_process_uap_event(struct mwifiex_private *priv) 
		dev_dbg(adapter->dev, "AP EVENT: event id: %#x\n", eventcause);

		break;

	case EVENT_AMSDU_AGGR_CTRL:

		dev_dbg(adapter->dev, "event:  AMSDU_AGGR_CTRL %d\n",

			*(u16 *)adapter->event_body);

		ctrl = le16_to_cpu(*(__le16 *)adapter->event_body);

		dev_dbg(adapter->dev, "event: AMSDU_AGGR_CTRL %d\n", ctrl);



		if (priv->media_connected) {

			adapter->tx_buf_size =

			       min(adapter->curr_tx_buf_size,

				   le16_to_cpu(*(__le16 *)adapter->event_body));



				min_t(u16, adapter->curr_tx_buf_size, ctrl);

			dev_dbg(adapter->dev, "event: tx_buf_size %d\n",

				adapter->tx_buf_size);

		}