diff options
| author | James Morris <jmorris@namei.org> | 2009-09-30 07:47:33 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-09-30 07:47:33 +1000 |
| commit | 1669b049db50fc7f1d4e694fb115a0f408c63fce (patch) | |
| tree | 9b3b90b5cbff9b8f30ecf0b2a44896ce8bef0c20 /drivers/net/vxge/vxge-traffic.h | |
| parent | 7f366784f5c2b8fc0658b5b374f4c63ee42c789f (diff) | |
| parent | 17d857be649a21ca90008c6dc425d849fa83db5c (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/vxge/vxge-traffic.h')
| -rw-r--r-- | drivers/net/vxge/vxge-traffic.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/vxge/vxge-traffic.h index 7567a1140d0..461742b4442 100644 --- a/drivers/net/vxge/vxge-traffic.h +++ b/drivers/net/vxge/vxge-traffic.h @@ -35,8 +35,6 @@ VXGE_HW_HEADER_VLAN_SIZE + \ VXGE_HW_HEADER_SNAP_SIZE) -#define VXGE_HW_TCPIP_HEADER_MAX_SIZE (64 + 64) - /* 32bit alignments */ #define VXGE_HW_HEADER_ETHERNET_II_802_3_ALIGN 2 #define VXGE_HW_HEADER_802_2_SNAP_ALIGN 2 @@ -2328,7 +2326,7 @@ enum vxge_hw_status vxge_hw_vpath_poll_rx( enum vxge_hw_status vxge_hw_vpath_poll_tx( struct __vxge_hw_fifo *fifoh, - void **skb_ptr); + struct sk_buff ***skb_ptr, int nr_skb, int *more); enum vxge_hw_status vxge_hw_vpath_alarm_process( struct __vxge_hw_vpath_handle *vpath_handle, |