Skip to content

Commit

Permalink
libertas: remove Beacon Control
Browse files Browse the repository at this point in the history
For now; it's a pretty easy command to hook up and whenever OLPC
figures out how they want the userspace interface to look (ie,
not iwpriv commands) we can easily add it back in.  Since the
cfg80211 conversion it wasn't working anyway.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Dan Williams authored and John W. Linville committed Jul 27, 2010
1 parent db08006 commit d6541c7
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 11 deletions.
4 changes: 0 additions & 4 deletions drivers/net/wireless/libertas/cfg.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ void lbs_cfg_free(struct lbs_private *priv);
int lbs_reg_notifier(struct wiphy *wiphy,
struct regulatory_request *request);

/* All of those are TODOs: */
#define lbs_cmd_bcn_ctrl(priv, cmdptr, cmd_action) (0)
#define lbs_ret_802_11_bcn_ctrl(priv, resp) (0)

void lbs_send_disconnect_notification(struct lbs_private *priv);
void lbs_send_mic_failureevent(struct lbs_private *priv, u32 event);

Expand Down
3 changes: 0 additions & 3 deletions drivers/net/wireless/libertas/cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1216,9 +1216,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,

#endif

case CMD_802_11_BEACON_CTRL:
ret = lbs_cmd_bcn_ctrl(priv, cmdptr, cmd_action);
break;
case CMD_802_11_DEEP_SLEEP:
cmdptr->command = cpu_to_le16(CMD_802_11_DEEP_SLEEP);
cmdptr->size = cpu_to_le16(sizeof(struct cmd_header));
Expand Down
3 changes: 0 additions & 3 deletions drivers/net/wireless/libertas/cmdresp.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
sizeof(resp->params.fwt));
spin_unlock_irqrestore(&priv->driver_lock, flags);
break;
case CMD_RET(CMD_802_11_BEACON_CTRL):
ret = lbs_ret_802_11_bcn_ctrl(priv, resp);
break;

default:
lbs_pr_err("CMD_RESP: unknown cmd response 0x%04x\n",
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/wireless/libertas/host.h
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,8 @@ struct cmd_ds_802_11_radio_control {
} __packed;

struct cmd_ds_802_11_beacon_control {
struct cmd_header hdr;

__le16 action;
__le16 beacon_enable;
__le16 beacon_period;
Expand Down Expand Up @@ -972,7 +974,6 @@ struct cmd_ds_command {

struct cmd_ds_bt_access bt;
struct cmd_ds_fwt_access fwt;
struct cmd_ds_802_11_beacon_control bcn_ctrl;
} params;
} __packed;
#endif

0 comments on commit d6541c7

Please sign in to comment.