linux/ixgbe: revert spurious modifications in vanilla patch

LINUX/final-patches/vanilla--ixgbe--50800--99999

@@ -1,5 +1,5 @@
 diff --git a/ixgbe/ixgbe_main.c b/ixgbe/ixgbe_main.c
-index 97a423ecf808..8b84a5992faa 100644
+index 97a423ecf808..a40ffcf4a6ee 100644
 --- a/ixgbe/ixgbe_main.c
 +++ b/ixgbe/ixgbe_main.c
 @@ -460,6 +460,22 @@ static const struct ixgbe_reg_info ixgbe_reg_info_tbl[] = {
@@ -43,11 +43,10 @@ index 97a423ecf808..8b84a5992faa 100644
  	tx_buffer = &tx_ring->tx_buffer_info[i];
  	tx_desc = IXGBE_TX_DESC(tx_ring, i);
  	i -= tx_ring->count;
-@@ -2299,13 +2326,23 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
+@@ -2299,6 +2326,16 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
  	unsigned int xdp_xmit = 0;
  	struct xdp_buff xdp;
 
--	xdp.rxq = &rx_ring->xdp_rxq;
 +#ifdef DEV_NETMAP
 +	/*
 +	 * 	 Same as the txeof routine: only wakeup clients on intr.
@@ -57,17 +56,10 @@ index 97a423ecf808..8b84a5992faa 100644
 +	if (nm_irq != NM_IRQ_PASS)
 +		return (nm_irq == NM_IRQ_RESCHED) ? budget : 1;
 +#endif /* DEV_NETMAP */
++
+ 	xdp.rxq = &rx_ring->xdp_rxq;
 
  	/* Frame size depend on rx_ring setup when PAGE_SIZE=4K */
- #if (PAGE_SIZE < 8192)
- 	xdp.frame_sz = ixgbe_rx_frame_truesize(rx_ring, 0);
- #endif
-
-+	xdp.rxq = &rx_ring->xdp_rxq;
-+
- 	while (likely(total_rx_packets < budget)) {
- 		union ixgbe_adv_rx_desc *rx_desc;
- 		struct ixgbe_rx_buffer *rx_buffer;
 @@ -3537,6 +3574,10 @@ void ixgbe_configure_tx_ring(struct ixgbe_adapter *adapter,
  	memset(ring->tx_buffer_info, 0,
  	       sizeof(struct ixgbe_tx_buffer) * ring->count);
@@ -79,15 +71,6 @@ index 97a423ecf808..8b84a5992faa 100644
  	/* enable queue */
  	IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(reg_idx), txdctl);
 
-@@ -3551,7 +3592,7 @@ void ixgbe_configure_tx_ring(struct ixgbe_adapter *adapter,
- 		txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(reg_idx));
- 	} while (--wait_loop && !(txdctl & IXGBE_TXDCTL_ENABLE));
- 	if (!wait_loop)
--		hw_dbg(hw, "Could not enable Tx Queue %d\n", reg_idx);
-+		e_err(drv, "Could not enable Tx Queue %d\n", reg_idx);
- }
-
- static void ixgbe_setup_mtqc(struct ixgbe_adapter *adapter)
 @@ -4144,6 +4185,10 @@ void ixgbe_configure_rx_ring(struct ixgbe_adapter *adapter,
  	IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(reg_idx), rxdctl);