//#define VLAN_DEBUG
//#define SKB_DEBUG
+//#define PTM_ETH_FCS
+
#ifdef DEBUG
#define DPRINTK(format, args...) printk(KERN_DEBUG "br2684: " format, ##args)
#else
#define DPRINTK(format, args...)
#endif
+#ifdef PTM_ETH_FCS
+typedef unsigned long uint32;
+typedef unsigned char uint8;
+
+static uint32 crc32( uint8 *pdata, uint nbytes, uint32 crc);
+#endif
+
+#if defined(CONFIG_BCM_VDSL)
+extern int g_nPtmTraffic;
+#endif
+
#ifdef SKB_DEBUG
static void skb_debug(const struct sk_buff *skb)
{
*/
#define ATM_HEADER_LEN 10
#define ATM_AND_MAC_LEN ((ATM_HEADER_LEN) + (2 * VLAN_ETH_ALEN))
+#define MAC_LEN (2 * VLAN_ETH_ALEN)
struct atm_vlan_ethhdr {
unsigned char h_atm_stuff[ATM_HEADER_LEN]; /* atm stuff 10 bytes */
veth = (struct atm_vlan_ethhdr *)skb_push(skb, VLAN_HLEN);
- /* Move the mac addresses to the beginning of the new header. */
- memmove(skb->data, skb->data + VLAN_HLEN, (2 * VLAN_ETH_ALEN) + ATM_HEADER_LEN);
+#ifdef CONFIG_BCM_VDSL
+ if (!g_nPtmTraffic) {
+ /* Move the mac addresses to the beginning of the new header. */
+ memmove(skb->data, skb->data + VLAN_HLEN, (2 * VLAN_ETH_ALEN) + ATM_HEADER_LEN);
+ }
+ else {
+ /* Move the mac addresses to the beginning of the new header. */
+ memmove(skb->data, skb->data + VLAN_HLEN, (2 * VLAN_ETH_ALEN)) ;
+ }
+#else
+ memmove(skb->data, skb->data + VLAN_HLEN, (2 * VLAN_ETH_ALEN)) ;
+#endif
/* first, the ethernet type */
veth->h_vlan_proto = __constant_htons(ETH_P_8021Q);
static int br2684_xmit_vcc(struct sk_buff *skb, struct br2684_dev *brdev,
struct br2684_vcc *brvcc)
{
- struct atm_vcc *atmvcc;
+ struct atm_vcc *atmvcc;
+#if defined(CONFIG_BCM_VDSL)
+ if( !g_nPtmTraffic ) {
+#endif
#ifdef FASTER_VERSION
- if (brvcc->encaps == e_llc)
- memcpy(skb_push(skb, 8), llc_oui_pid_pad, 8);
- /* last 2 bytes of llc_oui_pid_pad are managed by header routines;
- yes, you got it: 8 + 2 = sizeof(llc_oui_pid_pad)
- */
+ if (brvcc->encaps == e_llc)
+ memcpy(skb_push(skb, 8), llc_oui_pid_pad, 8);
+ /* last 2 bytes of llc_oui_pid_pad are managed by header routines;
+ yes, you got it: 8 + 2 = sizeof(llc_oui_pid_pad)
+ */
#else
- int minheadroom = (brvcc->encaps == e_llc) ? 10 : 2;
- if (skb_headroom(skb) < minheadroom) {
- struct sk_buff *skb2 = skb_realloc_headroom(skb, minheadroom);
- brvcc->copies_needed++;
- dev_kfree_skb(skb);
- if (skb2 == NULL) {
- brvcc->copies_failed++;
- return 0;
- }
- skb = skb2;
- }
- skb_push(skb, minheadroom);
- if (brvcc->encaps == e_llc)
- memcpy(skb->data, llc_oui_pid_pad, 10);
- else
- memset(skb->data, 0, 2);
+ int minheadroom = (brvcc->encaps == e_llc) ? 10 : 2;
+ if (skb_headroom(skb) < minheadroom) {
+ struct sk_buff *skb2 = skb_realloc_headroom(skb, minheadroom);
+ brvcc->copies_needed++;
+ dev_kfree_skb(skb);
+ if (skb2 == NULL) {
+ brvcc->copies_failed++;
+ return 0;
+ }
+ skb = skb2;
+ }
+ skb_push(skb, minheadroom);
+ if (brvcc->encaps == e_llc)
+ memcpy(skb->data, llc_oui_pid_pad, 10);
+ else
+ memset(skb->data, 0, 2);
#endif /* FASTER_VERSION */
#if defined(CONFIG_MIPS_BRCM)
- if (skb->len < MIN_PKT_SIZE)
- {
- struct sk_buff *skb2=skb_copy_expand(skb, 0, MIN_PKT_SIZE - skb->len, GFP_ATOMIC);
- dev_kfree_skb(skb);
- if (skb2 == NULL) {
- brvcc->copies_failed++;
- return 0;
- }
- skb = skb2;
- memset(skb->tail, 0, MIN_PKT_SIZE - skb->len);
- skb_put(skb, MIN_PKT_SIZE - skb->len);
- }
+ if (skb->len < MIN_PKT_SIZE)
+ {
+ struct sk_buff *skb2=skb_copy_expand(skb, 0, MIN_PKT_SIZE - skb->len, GFP_ATOMIC);
+ dev_kfree_skb(skb);
+ if (skb2 == NULL) {
+ brvcc->copies_failed++;
+ return 0;
+ }
+ skb = skb2;
+ memset(skb->tail, 0, MIN_PKT_SIZE - skb->len);
+ skb_put(skb, MIN_PKT_SIZE - skb->len);
+ }
+#endif
+#if defined(CONFIG_BCM_VDSL)
+ } // g_nPtmTrafffic
+ else
+ {
+#define MIN_PTM_PKT_LEN 60 // need to expand packet for the VDSL phisical layer to work
+ if (skb->len < MIN_PTM_PKT_LEN)
+ {
+ struct sk_buff *skb2=skb_copy_expand(skb, 0, MIN_PKT_SIZE - skb->len, GFP_ATOMIC);
+ dev_kfree_skb(skb);
+ if (skb2 == NULL) {
+ brvcc->copies_failed++;
+ return 0;
+ }
+ skb = skb2;
+ memset(skb->tail, 0, MIN_PKT_SIZE - skb->len);
+ skb_put(skb, MIN_PKT_SIZE - skb->len);
+ }
+ }
#endif
#ifdef SUPPORT_VLAN
#ifdef VLAN_DEBUG
- printk("=====> br2684_xmit_vcc bef add vlan tag, skb->len=0x%04x\n", skb->len);
- skb_debug(skb);
+ printk("=====> br2684_xmit_vcc bef add vlan tag, skb->len=0x%04x\n", skb->len);
+ skb_debug(skb);
#endif // VLAN_DEBUG
- /* Construct the second two bytes. This field looks something
- * like:
- * usr_priority: 3 bits (high bits)
- * CFI 1 bit
- * VLAN ID 12 bits (low bits)
- */
- //brvcc->vlan_id |= vlan_dev_get_egress_qos_mask(dev, skb);
- /* bit 3-0 of the 32-bit nfmark is the atm priority, set by iptables
- * bit 7-4 is the Ethernet switch physical port number, set by lan port drivers.
- * bit 8-11 is the wanVlan priority bits
- */
- if (brvcc->vlan_id != 0xffff) {
- brvcc->vlan_id &= 0xffff0fff; // clear the priority bits first
- // if bit 8-11 is set (none zeros), add in the priority bits
- if (skb->nfmark & 0x0000f000) {
- brvcc->vlan_id |= (skb->nfmark & 0x0000f000);
- }
- skb = vlan_tag_insert(skb, brvcc->vlan_id);
- if (!skb) {
- brdev->stats.tx_dropped++;
- return 1;
- }
+ /* Construct the second two bytes. This field looks something
+ * like:
+ * usr_priority: 3 bits (high bits)
+ * CFI 1 bit
+ * VLAN ID 12 bits (low bits)
+ */
+ //brvcc->vlan_id |= vlan_dev_get_egress_qos_mask(dev, skb);
+ /* bit 3-0 of the 32-bit nfmark is the atm priority, set by iptables
+ * bit 7-4 is the Ethernet switch physical port number, set by lan port drivers.
+ * bit 8-11 is the wanVlan priority bits
+ */
+ if (brvcc->vlan_id != 0xffff) {
+ brvcc->vlan_id &= 0xffff0fff; // clear the priority bits first
+ // if bit 8-11 is set (none zeros), add in the priority bits
+ if (skb->nfmark & 0x0000f000) {
+ brvcc->vlan_id |= (skb->nfmark & 0x0000f000);
+ }
+ skb = vlan_tag_insert(skb, brvcc->vlan_id) ;
+ if (!skb) {
+ brdev->stats.tx_dropped++;
+ return 1;
+ }
#ifdef VLAN_DEBUG
- printk("=====> br2684_xmit_vcc aft add vlan tag, skb->len=%d\n", skb->len);
- skb_debug(skb);
+ printk("=====> br2684_xmit_vcc aft add vlan tag, skb->len=%d\n", skb->len);
+ skb_debug(skb);
#endif // VLAN_DEBUG
- }
+ }
#endif // SUPPORT_VLAN
- ATM_SKB(skb)->vcc = atmvcc = brvcc->atmvcc;
- DPRINTK("atm_skb(%p)->vcc(%p)->dev(%p)\n", skb, atmvcc, atmvcc->dev);
- if (!atm_may_send(atmvcc, skb->truesize)) {
- /* we free this here for now, because we cannot know in a higher
- layer whether the skb point it supplied wasn't freed yet.
- now, it always is.
- */
- dev_kfree_skb(skb);
- return 0;
- }
- atomic_add(skb->truesize, &atmvcc->sk->sk_wmem_alloc);
- ATM_SKB(skb)->atm_options = atmvcc->atm_options;
- brdev->stats.tx_packets++;
- brdev->stats.tx_bytes += skb->len;
+#if defined(CONFIG_BCM_VDSL)
+#ifdef PTM_ETH_FCS
+ if( g_nPtmTraffic ) {
+ union crc_32_tag
+ {
+ int i;
+ char ch[4];
+ } crc_32;
+
+ crc_32.i = ~crc32(skb->data, skb->len, 0xffffffff);
+ /* crc bytes put in the memory in reverse order */
+ skb->data[skb->len] = crc_32.ch[3];
+ skb->data[skb->len + 1] = crc_32.ch[2];
+ skb->data[skb->len + 2] = crc_32.ch[1];
+ skb->data[skb->len + 3] = crc_32.ch[0];
+
+ skb->len += 4; // extra four bytes for ethernet checksum
+}
+#endif
+#endif
+
+
+ ATM_SKB(skb)->vcc = atmvcc = brvcc->atmvcc;
+ DPRINTK("atm_skb(%p)->vcc(%p)->dev(%p)\n", skb, atmvcc, atmvcc->dev);
+ if (!atm_may_send(atmvcc, skb->truesize)) {
+ /* we free this here for now, because we cannot know in a higher
+ layer whether the skb point it supplied wasn't freed yet.
+ now, it always is.
+ */
+ dev_kfree_skb(skb);
+ return 0;
+ }
+ atomic_add(skb->truesize, &atmvcc->sk->sk_wmem_alloc);
+ ATM_SKB(skb)->atm_options = atmvcc->atm_options;
+ brdev->stats.tx_packets++;
+ brdev->stats.tx_bytes += skb->len;
#if defined(CONFIG_MIPS_BRCM)
- if (atmvcc->send(atmvcc, skb) != 0)
- brdev->stats.tx_dropped++;
+ if (atmvcc->send(atmvcc, skb) != 0)
+ brdev->stats.tx_dropped++;
#else
- atmvcc->send(atmvcc, skb);
+ atmvcc->send(atmvcc, skb);
#endif
- return 1;
+ return 1;
}
static inline struct br2684_vcc *pick_outgoing_vcc(struct sk_buff *skb,
struct br2684_vcc *brvcc = BR2684_VCC(atmvcc);
struct net_device *net_dev = brvcc->device;
struct br2684_dev *brdev = BRPRIV(net_dev);
+#if !defined(CONFIG_BCM_VDSL)
int plen = sizeof(llc_oui_pid_pad) + ETH_HLEN;
+#else
+ /* Ethernet packets from PTM traffic will not have an RFC header in place */
+ int plen = ( !g_nPtmTraffic ) ? sizeof(llc_oui_pid_pad) + ETH_HLEN : ETH_HLEN;
+#endif
DPRINTK("br2684_push\n");
atm_return(atmvcc, skb->truesize);
DPRINTK("skb from brdev %p\n", brdev);
+#if defined(CONFIG_BCM_VDSL)
+ if ( !g_nPtmTraffic ) {
+#endif
if (brvcc->encaps == e_llc) {
/* let us waste some time for checking the encapsulation.
Note, that only 7 char is checked so frames with a valid FCS
dev_kfree_skb(skb); /* dev_ not needed? */
return;
}
+#if defined(CONFIG_BCM_VDSL)
+ } // !g_nPtmTraffic
+#endif
+
#ifdef SUPPORT_VLAN
- if (brvcc->vlan_id != 0xffff) { /* Vcc was configured to be vlan tagged*/
- unsigned tmp[ATM_AND_MAC_LEN];
+ if (brvcc->vlan_id != 0xffff) { /* Vcc was configured to be vlan tagged*/
+ unsigned tmp[ATM_AND_MAC_LEN];
#ifdef VLAN_DEBUG
- printk("=====> before removing vlan id\n");
- skb_debug(skb);
+ printk("=====> before removing vlan id\n");
+ skb_debug(skb);
+#endif
+ /*
+ ** There exist a situation where we tag vlan id upstream. But DSLAM sends untagged frame downstream. So we need to check this situation before we move data around
+ */
+ //eddie added if {}
+#if defined(CONFIG_BCM_VDSL)
+ if (!g_nPtmTraffic) {
+#endif
+ if ( skb->data[22] == 0x81 && skb->data[23] == 0x0) {
+ memcpy(tmp, skb->data, ATM_AND_MAC_LEN);
+ skb_pull(skb, VLAN_HLEN);
+ memcpy(skb->data, tmp, ATM_AND_MAC_LEN);
+ }
+#if defined(CONFIG_BCM_VDSL)
+ }
+ else {
+ if ( skb->data[MAC_LEN] == 0x81 && skb->data[MAC_LEN+1] == 0x0) {
+ memcpy(tmp, skb->data, MAC_LEN);
+ skb_pull(skb, VLAN_HLEN);
+ memcpy(skb->data, tmp, MAC_LEN);
+ }
+ }
#endif
-/*
-** There exist a situation where we tag vlan id upstream. But DSLAM sends untagged frame downstream. So we need to check this situation before we move data around
-*/
-//eddie added if {}
- if ( skb->data[22] == 0x81 && skb->data[23] == 0x0) {
- memcpy(tmp, skb->data, ATM_AND_MAC_LEN);
- skb_pull(skb, VLAN_HLEN);
- memcpy(skb->data, tmp, ATM_AND_MAC_LEN);
- }
#ifdef VLAN_DEBUG
- printk("=====> after removing vlan id\n");
- skb_debug(skb);
+ printk("=====> after removing vlan id\n");
+ skb_debug(skb);
#endif
- }
+ }
#endif // SUPPORT_VLAN
#ifdef FASTER_VERSION
}
#endif
- skb->dev = net_dev;
+ skb->dev = net_dev;
ATM_SKB(skb)->vcc = atmvcc; /* needed ? */
DPRINTK("received packet's protocol: %x\n", ntohs(skb->protocol));
dev_kfree_skb(skb);
return;
}
+
+#ifdef PTM_ETH_FCS
+#if defined(CONFIG_BCM_VDSL)
+ skb->len = (g_nPtmTraffic) ? (skb->len - 4) : skb->len ;
+#endif
+#endif
+
brdev->stats.rx_packets++;
brdev->stats.rx_bytes += skb->len;
memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data));
}
}
+#ifdef PTM_ETH_FCS
+/*******************************************************************************
+ * crc32
+ *
+ * Computes a crc32 over the input data using the polynomial:
+ *
+ * x^32+x^26+x^23+x^22+x^16+x^12+x^11+X^10+x^8+x^7+x^5+x^4+x^2+x+1
+ *
+ * The caller provides the initial value (either CRC32_INIT_VALUE
+ * or the previous returned value) to allow for processing of
+ * discontiguous blocks of data. When generating the CRC the
+ * caller is responsible for complementing the final return value
+ * and inserting it into the byte stream. When checking, a final
+ * return value of CRC32_GOOD_VALUE indicates a valid CRC.
+ *
+ * Reference: Dallas Semiconductor Application Note 27
+ * Williams, Ross N., "A Painless Guide to CRC Error Detection Algorithms",
+ * ver 3, Aug 1993, ross@guest.adelaide.edu.au, Rocksoft Pty Ltd.,
+ * ftp://ftp.rocksoft.com/clients/rocksoft/papers/crc_v3.txt
+ *
+ ******************************************************************************/
+
+static uint32 crc32_table[256] = {
+ 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
+ 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
+ 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+ 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
+ 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
+ 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+ 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
+ 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
+ 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+ 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
+ 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
+ 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+ 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
+ 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+ 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+ 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
+ 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
+ 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+ 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
+ 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+ 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+ 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
+ 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
+ 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+ 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
+ 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
+ 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+ 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+ 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
+ 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+ 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
+ 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
+ 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+ 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
+ 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
+ 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+ 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
+ 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
+ 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+ 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+ 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
+ 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+ 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
+ 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
+ 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+ 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
+ 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
+ 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+ 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
+ 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
+ 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+ 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
+ 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
+ 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+ 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
+ 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+ 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+ 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
+ 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
+ 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+ 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
+ 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
+ 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+ 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
+};
+
+#define CRC_INNER_LOOP(n, c, x) \
+ (c) = ((c) >> 8) ^ crc##n##_table[((c) ^ (x)) & 0xff]
+
+uint32 crc32( uint8 *pdata, uint nbytes, uint32 crc)
+{
+ while (nbytes-- > 0)
+ CRC_INNER_LOOP(32, crc, *pdata++);
+ return crc;
+}
+#endif
+
module_init(br2684_init);
module_exit(br2684_exit);
projects / bcm963xx.git / blobdiff