aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb-core/dvb_net.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c
index e17cb85d3ecf..c3cc3b52662b 100644
--- a/drivers/media/dvb-core/dvb_net.c
+++ b/drivers/media/dvb-core/dvb_net.c
@@ -185,7 +185,7 @@ static __be16 dvb_net_eth_type_trans(struct sk_buff *skb,
185 skb->pkt_type=PACKET_MULTICAST; 185 skb->pkt_type=PACKET_MULTICAST;
186 } 186 }
187 187
188 if (ntohs(eth->h_proto) >= 1536) 188 if (ntohs(eth->h_proto) >= ETH_P_802_3_MIN)
189 return eth->h_proto; 189 return eth->h_proto;
190 190
191 rawp = skb->data; 191 rawp = skb->data;
@@ -228,9 +228,9 @@ static int ule_test_sndu( struct dvb_net_priv *p )
228static int ule_bridged_sndu( struct dvb_net_priv *p ) 228static int ule_bridged_sndu( struct dvb_net_priv *p )
229{ 229{
230 struct ethhdr *hdr = (struct ethhdr*) p->ule_next_hdr; 230 struct ethhdr *hdr = (struct ethhdr*) p->ule_next_hdr;
231 if(ntohs(hdr->h_proto) < 1536) { 231 if(ntohs(hdr->h_proto) < ETH_P_802_3_MIN) {
232 int framelen = p->ule_sndu_len - ((p->ule_next_hdr+sizeof(struct ethhdr)) - p->ule_skb->data); 232 int framelen = p->ule_sndu_len - ((p->ule_next_hdr+sizeof(struct ethhdr)) - p->ule_skb->data);
233 /* A frame Type < 1536 for a bridged frame, introduces a LLC Length field. */ 233 /* A frame Type < ETH_P_802_3_MIN for a bridged frame, introduces a LLC Length field. */
234 if(framelen != ntohs(hdr->h_proto)) { 234 if(framelen != ntohs(hdr->h_proto)) {
235 return -1; 235 return -1;
236 } 236 }
@@ -320,7 +320,7 @@ static int handle_ule_extensions( struct dvb_net_priv *p )
320 (int) p->ule_sndu_type, l, total_ext_len); 320 (int) p->ule_sndu_type, l, total_ext_len);
321#endif 321#endif
322 322
323 } while (p->ule_sndu_type < 1536); 323 } while (p->ule_sndu_type < ETH_P_802_3_MIN);
324 324
325 return total_ext_len; 325 return total_ext_len;
326} 326}
@@ -712,7 +712,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
712 } 712 }
713 713
714 /* Handle ULE Extension Headers. */ 714 /* Handle ULE Extension Headers. */
715 if (priv->ule_sndu_type < 1536) { 715 if (priv->ule_sndu_type < ETH_P_802_3_MIN) {
716 /* There is an extension header. Handle it accordingly. */ 716 /* There is an extension header. Handle it accordingly. */
717 int l = handle_ule_extensions(priv); 717 int l = handle_ule_extensions(priv);
718 if (l < 0) { 718 if (l < 0) {