Rebase against Ubuntu-5.4.0-63.71

FreedomBen · Jan 14, 2021 · f07579c · f07579c
1 parent 0caf8fe
commit f07579c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/base.c b/base.c
@@ -1776,8 +1776,7 @@ int rtl_tx_agg_start( struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 
 	tid_data->agg.agg_state = RTL_AGG_START;
 
-	ieee80211_start_tx_ba_cb_irqsafe( vif, sta->addr, tid );
-	return 0;
+	return IEEE80211_AMPDU_TX_START_IMMEDIATE;
 }
 
 int rtl_tx_agg_stop( struct ieee80211_hw *hw, struct ieee80211_vif *vif,

diff --git a/pci.c b/pci.c
@@ -1062,13 +1062,15 @@ static irqreturn_t _rtl_pci_interrupt( int irq, void *dev_id )
 	return ret;
 }
 
-static void _rtl_pci_irq_tasklet( struct ieee80211_hw *hw )
+static void _rtl_pci_irq_tasklet( unsigned long data )
 {
+	struct ieee80211_hw *hw = ( struct ieee80211_hw * )data;
 	_rtl_pci_tx_chk_waitq( hw );
 }
 
-static void _rtl_pci_prepare_bcn_tasklet( struct ieee80211_hw *hw )
+static void _rtl_pci_prepare_bcn_tasklet( unsigned long data )
 {
+	struct ieee80211_hw *hw = ( struct ieee80211_hw * )data;
 	struct rtl_priv *rtlpriv = rtl_priv( hw );
 	struct rtl_pci *rtlpci = rtl_pcidev( rtl_pcipriv( hw ) );
 	struct rtl_mac *mac = rtl_mac( rtl_priv( hw ) );
@@ -1194,10 +1196,10 @@ static void _rtl_pci_init_struct( struct ieee80211_hw *hw,
 
 	/*task */
 	tasklet_init( &rtlpriv->works.irq_tasklet,
-		     ( void ( * )( unsigned long ) )_rtl_pci_irq_tasklet,
+		     _rtl_pci_irq_tasklet,
 		     ( unsigned long )hw );
 	tasklet_init( &rtlpriv->works.irq_prepare_bcn_tasklet,
-		     ( void ( * )( unsigned long ) )_rtl_pci_prepare_bcn_tasklet,
+		     _rtl_pci_prepare_bcn_tasklet,
 		     ( unsigned long )hw );
 	INIT_WORK( &rtlpriv->works.lps_change_work,
 		  rtl_lps_change_work_callback );

diff --git a/rc.c b/rc.c
@@ -261,7 +261,7 @@ static void rtl_rate_update( void *ppriv,
 {
 }
 
-static void *rtl_rate_alloc( struct ieee80211_hw *hw, struct dentry *debugfsdir )
+static void *rtl_rate_alloc( struct ieee80211_hw *hw )
 {
 	struct rtl_priv *rtlpriv = rtl_priv( hw );
 	return rtlpriv;

diff --git a/rtl8188ee/trx.h b/rtl8188ee/trx.h
@@ -561,6 +561,7 @@ static inline void clear_pci_tx_desc_content( __le32 *__pdesc, int _size )
 	 rxmcs == DESC92C_RATE11M )
 
 struct phy_status_rpt {
+	u8	padding[2];
 	u8	ch_corr[2];
 	u8	cck_sig_qual_ofdm_pwdb_all;
 	u8	cck_agc_rpt_ofdm_cfosho_a;

diff --git a/usb.c b/usb.c
@@ -719,8 +719,11 @@ static int _rtl_usb_receive( struct ieee80211_hw *hw )
 
 		usb_anchor_urb( urb, &rtlusb->rx_submitted );
 		err = usb_submit_urb( urb, GFP_KERNEL );
-		if ( err )
+		if ( err ) {
+			usb_unanchor_urb( urb );
+			usb_free_urb( urb );
 			goto err_out;
+		}
 		usb_free_urb( urb );
 	}
 	return 0;
@@ -882,10 +885,8 @@ static struct urb *_rtl_usb_tx_urb_setup( struct ieee80211_hw *hw,
 
 	WARN_ON( NULL == skb );
 	_urb = usb_alloc_urb( 0, GFP_ATOMIC );
-	if ( !_urb ) {
-		kfree_skb( skb );
+	if ( !_urb )
 		return NULL;
-	}
 	_rtl_install_trx_info( rtlusb, skb, ep_num );
 	usb_fill_bulk_urb( _urb, rtlusb->udev, usb_sndbulkpipe( rtlusb->udev,
 			  ep_num ), skb->data, skb->len, _rtl_tx_complete, skb );
@@ -899,7 +900,6 @@ static void _rtl_usb_transmit( struct ieee80211_hw *hw, struct sk_buff *skb,
 	struct rtl_usb *rtlusb = rtl_usbdev( rtl_usbpriv( hw ) );
 	u32 ep_num;
 	struct urb *_urb = NULL;
-	struct sk_buff *_skb = NULL;
 
 	WARN_ON( NULL == rtlusb->usb_tx_aggregate_hdl );
 	if ( unlikely( IS_USB_STOP( rtlusb ) ) ) {
@@ -908,8 +908,7 @@ static void _rtl_usb_transmit( struct ieee80211_hw *hw, struct sk_buff *skb,
 		return;
 	}
 	ep_num = rtlusb->ep_map.ep_mapping[qnum];
-	_skb = skb;
-	_urb = _rtl_usb_tx_urb_setup( hw, _skb, ep_num );
+	_urb = _rtl_usb_tx_urb_setup( hw, skb, ep_num );
 	if ( unlikely( !_urb ) ) {
 		pr_err( "Can't allocate urb. Drop skb!\n" );
 		kfree_skb( skb );