← Back to branch summary

~ubuntu-branches/ubuntu/wily/linux-ti-omap4/wily

« back to all changes in this revision

Viewing changes to drivers/net/ethernet/mellanox/mlx4/en_tx.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-26.42
  • Date: 2013-03-14 15:21:40 UTC
  • mfrom: (76.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130314152140-tl4mkjmxa038tm3h
Tags: 3.5.0-221.31
https://launchpad.net/bugs/1153648
https://launchpad.net/bugs/1152715
https://launchpad.net/bugs/1122094
https://launchpad.net/bugs/1147678
* Release Tracking Bug
  - LP: #1153648

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-26.42

[ Ubuntu: 3.5.0-26.42 ]

* Release Tracking Bug
  - LP: #1152715
* ubuntu: overlayfs -- fix missmerge of vfs_open changes
  - LP: #1122094, #1147678

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/ethernet/mellanox/mlx4/en_tx.c
633
633
                ring->tx_csum++;
634
634
        }
635
635
 
636
 
        /* Copy dst mac address to wqe */
637
 
        ethh = (struct ethhdr *)skb->data;
638
 
        tx_desc->ctrl.srcrb_flags16[0] = get_unaligned((__be16 *)ethh->h_dest);
639
 
        tx_desc->ctrl.imm = get_unaligned((__be32 *)(ethh->h_dest + 2));
 
636
        if (mlx4_is_mfunc(mdev->dev) || priv->validate_loopback) {
 
637
                /* Copy dst mac address to wqe. This allows loopback in eSwitch,
 
638
                 * so that VFs and PF can communicate with each other
 
639
                 */
 
640
                ethh = (struct ethhdr *)skb->data;
 
641
                tx_desc->ctrl.srcrb_flags16[0] = get_unaligned((__be16 *)ethh->h_dest);
 
642
                tx_desc->ctrl.imm = get_unaligned((__be32 *)(ethh->h_dest + 2));
 
643
        }
 
644
 
640
645
        /* Handle LSO (TSO) packets */
641
646
        if (lso_header_size) {
642
647
                /* Mark opcode as LSO */