Messages in this thread Patch in this message | | | Date | Wed, 28 Jul 2004 16:58:27 +1000 | From | David Gibson <> | Subject | [10/15] 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 =================================================================== --- working-2.6.orig/drivers/net/wireless/orinoco.c 2004-07-28 15:05:43.829982664 +1000 +++ working-2.6/drivers/net/wireless/orinoco.c 2004-07-28 15:05:47.239464344 +1000 @@ -813,7 +813,7 @@ 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); Index: working-2.6/drivers/net/wireless/orinoco_tmd.c =================================================================== --- working-2.6.orig/drivers/net/wireless/orinoco_tmd.c 2004-07-28 15:05:43.818984336 +1000 +++ working-2.6/drivers/net/wireless/orinoco_tmd.c 2004-07-28 15:05:47.241464040 +1000 @@ -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) -- David Gibson | For every complex problem there is a david AT gibson.dropbear.id.au | solution which is simple, neat and | wrong. http://www.ozlabs.org/people/dgibson - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |