Merge branch 'lro'

diff --cc drivers/net/s2io.c
Simple merge

diff --cc drivers/net/s2io.h
index 68ae336,65cc59a..0a0b5b2
--- 1/drivers/net/s2io.h
--- 2/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@@ -932,9 -967,15 +964,15 @@@ static irqreturn_t s2io_isr(int irq, vo
  static int verify_xena_quiescence(nic_t *sp, u64 val64, int flag);
  static struct ethtool_ops netdev_ethtool_ops;
  static void s2io_set_link(unsigned long data);
 -int s2io_set_swapper(nic_t * sp);
 +static int s2io_set_swapper(nic_t * sp);
  static void s2io_card_down(nic_t *nic);
  static int s2io_card_up(nic_t *nic);
 -int get_xena_rev_id(struct pci_dev *pdev);
 -void restore_xmsi_data(nic_t *nic);
 +static int get_xena_rev_id(struct pci_dev *pdev);
 +static void restore_xmsi_data(nic_t *nic);
+ 
+ static int s2io_club_tcp_session(u8 *buffer, u8 **tcp, u32 *tcp_len, lro_t **lro, RxD_t *rxdp, nic_t *sp);
+ static void clear_lro_session(lro_t *lro);
+ static void queue_rx_frame(struct sk_buff *skb);
+ static void update_L3L4_header(nic_t *sp, lro_t *lro);
+ static void lro_append_pkt(nic_t *sp, lro_t *lro, struct sk_buff *skb, u32 tcp_len);
  #endif                                /* _S2IO_H */