From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 13 Feb 2013 15:12:39 +0000 (-0500)
Subject: Merge tag 'v3.8-rc7' into linux-next
X-Git-Tag: next-20130218~34^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=22fc8095944562bcd0bac8db307baccc918cd044;p=karo-tx-linux.git

Merge tag 'v3.8-rc7' into linux-next

Linux 3.8-rc7

* tag 'v3.8-rc7': (176 commits)
  Linux 3.8-rc7
  net: sctp: sctp_endpoint_free: zero out secret key data
  net: sctp: sctp_setsockopt_auth_key: use kzfree instead of kfree
  atm/iphase: rename fregt_t -> ffreg_t
  ARM: 7641/1: memory: fix broken mmap by ensuring TASK_UNMAPPED_BASE is aligned
  ARM: DMA mapping: fix bad atomic test
  ARM: realview: ensure that we have sufficient IRQs available
  ARM: GIC: fix GIC cpumask initialization
  net: usb: fix regression from FLAG_NOARP code
  l2tp: dont play with skb->truesize
  net: sctp: sctp_auth_key_put: use kzfree instead of kfree
  netback: correct netbk_tx_err to handle wrap around.
  xen/netback: free already allocated memory on failure in xen_netbk_get_requests
  xen/netback: don't leak pages on failure in xen_netbk_tx_check_gop.
  xen/netback: shutdown the ring if it contains garbage.
  drm/ttm: fix fence locking in ttm_buffer_object_transfer, 2nd try
  virtio_console: Don't access uninitialized data.
  net: qmi_wwan: add more Huawei devices, including E320
  net: cdc_ncm: add another Huawei vendor specific device
  ipv6/ip6_gre: fix error case handling in ip6gre_tunnel_xmit()
  ...
---

22fc8095944562bcd0bac8db307baccc918cd044
diff --cc drivers/net/xen-netback/netback.c
index aab86772facf,2b9520c46e97..5ecc13cdbebe
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@@ -1497,15 -1520,14 +1523,16 @@@ static void xen_netbk_tx_action(struct 
  
  	if (nr_gops == 0)
  		return;
 -
 -	gnttab_batch_copy(netbk->tx_copy_ops, nr_gops);
 +	ret = HYPERVISOR_grant_table_op(GNTTABOP_copy,
 +					netbk->tx_copy_ops, nr_gops);
 +	BUG_ON(ret);
  
  	xen_netbk_tx_submit(netbk);
 +
  }
  
- static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx)
+ static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx,
+ 				  u8 status)
  {
  	struct xenvif *vif;
  	struct pending_tx_info *pending_tx_info;