diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-10-09 22:32:56 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-10-09 22:32:56 -0400 |
| commit | b529225243ecb9874c85becd69a7abba586ed7d6 (patch) | |
| tree | 56693875743592418753772eeed8535834073631 | |
| parent | d7f458fb20e39ee3ad4c51f159c255ee378c3ef6 (diff) | |
| download | longterm-queue-2.6.34-b529225243ecb9874c85becd69a7abba586ed7d6.tar.gz | |
virtio: fix incorrect use of future's fcn wrapper.
I'd put right in the commit log:
[PG: in 34, virtqueue_disable_cb is vi->rvq->vq_ops->disable_cb]
and then didn't change both instances. Duh.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/series | 2 | ||||
| -rw-r--r-- | queue/virtio_net-Add-schedule-check-to-napi_enable-call.patch | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/queue/series b/queue/series index ef1caab..7927a48 100644 --- a/queue/series +++ b/queue/series @@ -143,6 +143,8 @@ hwmon-applesmc-Add-MacBookAir3-1-3-2-support.patch ALSA-emux-Add-trivial-compat-ioctl-handler.patch ALSA-powermac-Reverse-HP-detection-on-G4-DA.patch ALSA-powermac-Lineout-detection-on-G4-DA.patch +# below not in .40, but needed to avoid compile regression +ALSA-powermac-Fix-obsoleted-machine_is_compatible.patch ALSA-hda-MacBookPro-5-3-line-in-support.patch ALSA-hda-Add-model-mbp55-entry-for-MacBookPro-7-1.patch ALSA-hda-MacBookAir3-1-3-2-alsa-support.patch diff --git a/queue/virtio_net-Add-schedule-check-to-napi_enable-call.patch b/queue/virtio_net-Add-schedule-check-to-napi_enable-call.patch index f4fed25..e7d2648 100644 --- a/queue/virtio_net-Add-schedule-check-to-napi_enable-call.patch +++ b/queue/virtio_net-Add-schedule-check-to-napi_enable-call.patch @@ -37,7 +37,7 @@ index f5b5d74..195104d 100644 + * now. virtnet_poll wants re-enable the queue, so we disable here. + * We synchronize against interrupts via NAPI_STATE_SCHED */ + if (napi_schedule_prep(&vi->napi)) { -+ virtqueue_disable_cb(vi->rvq); ++ vi->rvq->vq_ops->disable_cb(vi->rvq); + __napi_schedule(&vi->napi); + } +} |