[PATCH] orinoco merge preliminaries - miscelaneous

Random trivial cleanups that don't belong with anything else:
	- Use ETH_DATA_LEN instead of hard-coded constant
	- Remove a duplicated constant in an | expression
Signed-off-by: David Gibson <hermes@gibson.dropbear.id>

Index: working-2.6/drivers/net/wireless/orinoco.c
===================================================================

drivers/net/wireless/orinoco.c

@@ -813,7 +813,7 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
 			   HERMES_802_3_OFFSET - HERMES_802_11_OFFSET);
 
 	/* Encapsulate Ethernet-II frames */
-	if (ntohs(eh->h_proto) > 1500) { /* Ethernet-II frame */
+	if (ntohs(eh->h_proto) > ETH_DATA_LEN) { /* Ethernet-II frame */
 		struct header_struct hdr;
 		data_len = len;
 		data_off = HERMES_802_3_OFFSET + sizeof(hdr);

drivers/net/wireless/orinoco_tmd.c

@@ -78,7 +78,7 @@
 
 static char dev_info[] = "orinoco_tmd";
 
-#define COR_VALUE	(COR_LEVEL_REQ | COR_FUNC_ENA | COR_FUNC_ENA) /* Enable PC card with interrupt in level trigger */
+#define COR_VALUE	(COR_LEVEL_REQ | COR_FUNC_ENA) /* Enable PC card with interrupt in level trigger */
 
 static int orinoco_tmd_init_one(struct pci_dev *pdev,
 				const struct pci_device_id *ent)