|
@@ -2379,16 +2379,17 @@ struct rtl_hal_usbint_cfg {
|
|
u32 rx_max_size;
|
|
u32 rx_max_size;
|
|
|
|
|
|
/* op - rx */
|
|
/* op - rx */
|
|
- void (*usb_rx_hdl)(struct ieee80211_hw *, struct sk_buff *);
|
|
|
|
- void (*usb_rx_segregate_hdl)(struct ieee80211_hw *, struct sk_buff *,
|
|
|
|
- struct sk_buff_head *);
|
|
|
|
|
|
+ void (*usb_rx_hdl)(struct ieee80211_hw *hw, struct sk_buff *skb);
|
|
|
|
+ void (*usb_rx_segregate_hdl)(struct ieee80211_hw *hw,
|
|
|
|
+ struct sk_buff *skb,
|
|
|
|
+ struct sk_buff_head *skbh);
|
|
|
|
|
|
/* tx */
|
|
/* tx */
|
|
- void (*usb_tx_cleanup)(struct ieee80211_hw *, struct sk_buff *);
|
|
|
|
- int (*usb_tx_post_hdl)(struct ieee80211_hw *, struct urb *,
|
|
|
|
- struct sk_buff *);
|
|
|
|
- struct sk_buff *(*usb_tx_aggregate_hdl)(struct ieee80211_hw *,
|
|
|
|
- struct sk_buff_head *);
|
|
|
|
|
|
+ void (*usb_tx_cleanup)(struct ieee80211_hw *hw, struct sk_buff *skb);
|
|
|
|
+ int (*usb_tx_post_hdl)(struct ieee80211_hw *hw, struct urb *urb,
|
|
|
|
+ struct sk_buff *skb);
|
|
|
|
+ struct sk_buff *(*usb_tx_aggregate_hdl)(struct ieee80211_hw *hw,
|
|
|
|
+ struct sk_buff_head *skbh);
|
|
|
|
|
|
/* endpoint mapping */
|
|
/* endpoint mapping */
|
|
int (*usb_endpoint_mapping)(struct ieee80211_hw *hw);
|
|
int (*usb_endpoint_mapping)(struct ieee80211_hw *hw);
|
|
@@ -2693,12 +2694,12 @@ struct rtl_btc_ops {
|
|
};
|
|
};
|
|
|
|
|
|
struct rtl_halmac_ops {
|
|
struct rtl_halmac_ops {
|
|
- int (*halmac_init_adapter)(struct rtl_priv *);
|
|
|
|
- int (*halmac_deinit_adapter)(struct rtl_priv *);
|
|
|
|
- int (*halmac_init_hal)(struct rtl_priv *);
|
|
|
|
- int (*halmac_deinit_hal)(struct rtl_priv *);
|
|
|
|
- int (*halmac_poweron)(struct rtl_priv *);
|
|
|
|
- int (*halmac_poweroff)(struct rtl_priv *);
|
|
|
|
|
|
+ int (*halmac_init_adapter)(struct rtl_priv *rtlpriv);
|
|
|
|
+ int (*halmac_deinit_adapter)(struct rtl_priv *rtlpriv);
|
|
|
|
+ int (*halmac_init_hal)(struct rtl_priv *rtlpriv);
|
|
|
|
+ int (*halmac_deinit_hal)(struct rtl_priv *rtlpriv);
|
|
|
|
+ int (*halmac_poweron)(struct rtl_priv *rtlpriv);
|
|
|
|
+ int (*halmac_poweroff)(struct rtl_priv *rtlpriv);
|
|
|
|
|
|
int (*halmac_phy_power_switch)(struct rtl_priv *rtlpriv, u8 enable);
|
|
int (*halmac_phy_power_switch)(struct rtl_priv *rtlpriv, u8 enable);
|
|
int (*halmac_set_mac_address)(struct rtl_priv *rtlpriv, u8 hwport,
|
|
int (*halmac_set_mac_address)(struct rtl_priv *rtlpriv, u8 hwport,
|