mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 02:19:51 +00:00
Staging: Octeon Ethernet: Use constants from in.h
Signed-off-by: David Daney <ddaney@caviumnetworks.com> To: linux-mips@linux-mips.org To: gregkh@suse.de Patchwork: http://patchwork.linux-mips.org/patch/837/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
924cc2680f
commit
081f6749ae
2 changed files with 4 additions and 7 deletions
|
@ -98,9 +98,6 @@
|
|||
#define MAX_SKB_TO_FREE 10
|
||||
#define MAX_OUT_QUEUE_DEPTH 1000
|
||||
|
||||
#define IP_PROTOCOL_TCP 6
|
||||
#define IP_PROTOCOL_UDP 0x11
|
||||
|
||||
#define FAU_NUM_PACKET_BUFFERS_TO_FREE (CVMX_FAU_REG_END - sizeof(uint32_t))
|
||||
#define TOTAL_NUMBER_OF_PORTS (CVMX_PIP_NUM_INPUT_PORTS+1)
|
||||
|
||||
|
|
|
@ -359,8 +359,8 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
if (USE_HW_TCPUDP_CHECKSUM && (skb->protocol == htons(ETH_P_IP)) &&
|
||||
(ip_hdr(skb)->version == 4) && (ip_hdr(skb)->ihl == 5) &&
|
||||
((ip_hdr(skb)->frag_off == 0) || (ip_hdr(skb)->frag_off == 1 << 14))
|
||||
&& ((ip_hdr(skb)->protocol == IP_PROTOCOL_TCP)
|
||||
|| (ip_hdr(skb)->protocol == IP_PROTOCOL_UDP))) {
|
||||
&& ((ip_hdr(skb)->protocol == IPPROTO_TCP)
|
||||
|| (ip_hdr(skb)->protocol == IPPROTO_UDP))) {
|
||||
/* Use hardware checksum calc */
|
||||
pko_command.s.ipoffp1 = sizeof(struct ethhdr) + 1;
|
||||
}
|
||||
|
@ -550,8 +550,8 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)
|
|||
work->word2.s.dec_ipcomp = 0; /* FIXME */
|
||||
#endif
|
||||
work->word2.s.tcp_or_udp =
|
||||
(ip_hdr(skb)->protocol == IP_PROTOCOL_TCP)
|
||||
|| (ip_hdr(skb)->protocol == IP_PROTOCOL_UDP);
|
||||
(ip_hdr(skb)->protocol == IPPROTO_TCP)
|
||||
|| (ip_hdr(skb)->protocol == IPPROTO_UDP);
|
||||
#if 0
|
||||
/* FIXME */
|
||||
work->word2.s.dec_ipsec = 0;
|
||||
|
|
Loading…
Reference in a new issue